You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ni...@apache.org on 2013/04/24 22:52:51 UTC
git commit: Revert "TS-1847: Don't trash buffer in MIOBuffer::fill"
Updated Branches:
refs/heads/master c5d8c6e16 -> 9f4429d25
Revert "TS-1847: Don't trash buffer in MIOBuffer::fill"
This reverts commit 10b3e1cff6e40725562a80b39b6d52bede104616.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/9f4429d2
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/9f4429d2
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/9f4429d2
Branch: refs/heads/master
Commit: 9f4429d25c63ee28d7ae7fc8ce659205634556ad
Parents: c5d8c6e
Author: niq <ni...@apache.org>
Authored: Wed Apr 24 21:51:29 2013 +0100
Committer: niq <ni...@apache.org>
Committed: Wed Apr 24 21:51:29 2013 +0100
----------------------------------------------------------------------
iocore/eventsystem/P_IOBuffer.h | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9f4429d2/iocore/eventsystem/P_IOBuffer.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/P_IOBuffer.h b/iocore/eventsystem/P_IOBuffer.h
index 10abd5e..8f9189a 100644
--- a/iocore/eventsystem/P_IOBuffer.h
+++ b/iocore/eventsystem/P_IOBuffer.h
@@ -997,16 +997,15 @@ MIOBuffer::write_avail()
TS_INLINE void
MIOBuffer::fill(int64_t len)
{
- IOBufferBlock *my_writer = _writer;
- int64_t f = my_writer->write_avail();
+ int64_t f = _writer->write_avail();
while (f < len) {
- my_writer->fill(f);
+ _writer->fill(f);
len -= f;
if (len > 0)
- my_writer = my_writer->next;
- f = my_writer->write_avail();
+ _writer = _writer->next;
+ f = _writer->write_avail();
}
- my_writer->fill(len);
+ _writer->fill(len);
}
TS_INLINE int