[trafficserver] branch master updated: Reset water_mark in new_empty_MIOBuffer_internal

[ga...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

gancho pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new c7b2c64  Reset water_mark in new_empty_MIOBuffer_internal
c7b2c64 is described below

commit c7b2c6459e3f63043787bf4fc3328dcad9771d47
Author: Gancho Tenev <ga...@apache.org>
AuthorDate: Sat Jan 13 14:34:49 2018 -0800

    Reset water_mark in new_empty_MIOBuffer_internal
    
    Moving water_mark reset one level up from MIOBuffer::alloc()
    to new_MIOBuffer_internal() and adding it "symmetrically" to
    new_empty_MIOBuffer_internal().
    This will allow new_empty_MIOBuffer() to benefit from the
    fix in commit db81103d0 as well.
---
 iocore/eventsystem/P_IOBuffer.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/iocore/eventsystem/P_IOBuffer.h b/iocore/eventsystem/P_IOBuffer.h
index 748811c..5e063ff 100644
--- a/iocore/eventsystem/P_IOBuffer.h
+++ b/iocore/eventsystem/P_IOBuffer.h
@@ -789,6 +789,7 @@ new_MIOBuffer_internal(
   b->_location = location;
 #endif
   b->alloc(size_index);
+  b->water_mark = 0;
   return b;
 }
 
@@ -809,6 +810,7 @@ new_empty_MIOBuffer_internal(
 {
   MIOBuffer *b  = THREAD_ALLOC(ioAllocator, this_thread());
   b->size_index = size_index;
+  b->water_mark = 0;
 #ifdef TRACK_BUFFER_USER
   b->_location = location;
 #endif
@@ -1123,7 +1125,6 @@ MIOBuffer::alloc(int64_t i)
 #endif
   _writer->alloc(i);
   size_index = i;
-  water_mark = 0;
   init_readers();
 }
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].