GitHub/libevent
1
0
Fork 0
mirror of https://github.com/libevent/libevent.git synced 2025-01-31 09:12:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Do not remove an empty chain that we have pinned for reading when we drain the whole buffer.

Browse Source 
svn:r1166
This commit is contained in:
Nick Mathewson 2009-04-13 03:06:59 +00:00
parent 9f1a94ecec
commit 0e32ba54dc
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
buffer.c
View File

@ -132,6 +132,7 @@ static int use_mmap = 1;
#define CHAIN_PINNED(ch) (((ch)->flags & EVBUFFER_MEM_PINNED_ANY) != 0) #define CHAIN_PINNED(ch) (((ch)->flags & EVBUFFER_MEM_PINNED_ANY) != 0)
#define CHAIN_PINNED_R(ch) (((ch)->flags & EVBUFFER_MEM_PINNED_R) != 0)
static void evbuffer_chain_align(struct evbuffer_chain *chain); static void evbuffer_chain_align(struct evbuffer_chain *chain);
static void evbuffer_deferred_callback(struct deferred_cb *cb, void *arg); static void evbuffer_deferred_callback(struct deferred_cb *cb, void *arg);
@ -636,10 +637,8 @@ evbuffer_drain(struct evbuffer *buf, size_t len)
goto done; goto done;
} }
/* TODO(nickm) when we drain the last byte from a chain, we
* should not unlink or free it if it is pinned. */
if (len >= old_len) { if (len >= old_len && !(buf->last && CHAIN_PINNED_R(buf->last))) {
len = old_len; len = old_len;
for (chain = buf->first; chain != NULL; chain = next) { for (chain = buf->first; chain != NULL; chain = next) {
next = chain->next; next = chain->next;
@ -649,12 +648,17 @@ evbuffer_drain(struct evbuffer *buf, size_t len)
ZERO_CHAIN(buf); ZERO_CHAIN(buf);
} else { } else {
if (len >= old_len)
len = old_len;
buf->total_len -= len; buf->total_len -= len;
for (chain = buf->first; len >= chain->off; chain = next) { for (chain = buf->first; len >= chain->off; chain = next) {
next = chain->next; next = chain->next;
len -= chain->off; len -= chain->off;
if (len == 0 && CHAIN_PINNED_R(chain))
break;
evbuffer_chain_free(chain); evbuffer_chain_free(chain);
} }