cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-12 13:58:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

from trunk: expose bufferevent_setwatermark via header files and fix high watermark on read

Browse Source 
svn:r730
This commit is contained in:
Niels Provos 2008-04-26 00:38:36 +00:00
parent f5b17df11d
commit 47abd3eaa5
3 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -3,6 +3,7 @@ Changes in 1.4.4-stable:
o Don't warn on unimplemented epoll_create(): this isn't a problem, just a reason to fall back to poll or select. o Don't warn on unimplemented epoll_create(): this isn't a problem, just a reason to fall back to poll or select.
o Correctly handle timeouts larger than 35 minutes on Linux with epoll.c. This is probably a kernel defect, but we'll have to support old kernels anyway even if it gets fixed. o Correctly handle timeouts larger than 35 minutes on Linux with epoll.c. This is probably a kernel defect, but we'll have to support old kernels anyway even if it gets fixed.
o Fix a potential stack corruption bug in tagging on 64-bit CPUs. o Fix a potential stack corruption bug in tagging on 64-bit CPUs.
o expose bufferevent_setwatermark via header files and fix high watermark on read
Changes in 1.4.3-stable: Changes in 1.4.3-stable:

16
evbuffer.c
View File

@ -52,7 +52,6 @@
/* prototypes */ /* prototypes */
void bufferevent_setwatermark(struct bufferevent *, short, size_t, size_t);
void bufferevent_read_pressure_cb(struct evbuffer *, size_t, size_t, void *); void bufferevent_read_pressure_cb(struct evbuffer *, size_t, size_t, void *);
static int static int
@ -108,8 +107,17 @@ bufferevent_readcb(int fd, short event, void *arg)
* If we have a high watermark configured then we don't want to * If we have a high watermark configured then we don't want to
* read more data than would make us reach the watermark. * read more data than would make us reach the watermark.
*/ */
if (bufev->wm_read.high != 0) if (bufev->wm_read.high != 0) {
howmuch = bufev->wm_read.high; howmuch = bufev->wm_read.high - EVBUFFER_LENGTH(bufev->input);
/* we might have lowered the watermark, stop reading */
if (howmuch <= 0) {
struct evbuffer *buf = bufev->input;
event_del(&bufev->ev_read);
evbuffer_setcb(buf,
bufferevent_read_pressure_cb, bufev);
return;
}
}
res = evbuffer_read(bufev->input, fd, howmuch); res = evbuffer_read(bufev->input, fd, howmuch);
if (res == -1) { if (res == -1) {
@ -131,7 +139,7 @@ bufferevent_readcb(int fd, short event, void *arg)
len = EVBUFFER_LENGTH(bufev->input); len = EVBUFFER_LENGTH(bufev->input);
if (bufev->wm_read.low != 0 && len < bufev->wm_read.low) if (bufev->wm_read.low != 0 && len < bufev->wm_read.low)
return; return;
if (bufev->wm_read.high != 0 && len > bufev->wm_read.high) { if (bufev->wm_read.high != 0 && len >= bufev->wm_read.high) {
struct evbuffer *buf = bufev->input; struct evbuffer *buf = bufev->input;
event_del(&bufev->ev_read); event_del(&bufev->ev_read);

19
event.h
View File

@ -907,6 +907,25 @@ void bufferevent_settimeout(struct bufferevent *bufev,
int timeout_read, int timeout_write); int timeout_read, int timeout_write);
/**
Sets the watermarks for read and write events.
On input, a bufferevent does not invoke the user read callback unless
there is at least low watermark data in the buffer. If the read buffer
is beyond the high watermark, the buffevent stops reading from the network.
On output, the user write callback is invoked whenever the buffered data
falls below the low watermark.
@param bufev the bufferevent to be modified
@param events EV_READ, EV_WRITE or both
@param lowmark the lower watermark to set
@param highmark the high watermark to set
*/
void bufferevent_setwatermark(struct bufferevent *bufev, short events,
size_t lowmark, size_t highmark);
#define EVBUFFER_LENGTH(x) (x)->off #define EVBUFFER_LENGTH(x) (x)->off
#define EVBUFFER_DATA(x) (x)->buffer #define EVBUFFER_DATA(x) (x)->buffer
#define EVBUFFER_INPUT(x) (x)->input #define EVBUFFER_INPUT(x) (x)->input