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

Merge remote-tracking branch 'origin/patches-2.0'

Browse Source
This commit is contained in:
Nick Mathewson 2013-12-20 13:37:39 -05:00
commit db7acd1310
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/event2/bufferevent.h
View File

@ -44,10 +44,10 @@
with bufferevent_enable() and bufferevent_disable().
When reading is enabled, the bufferevent will try to read from the
file descriptor onto its input buffer, and and call the read callback.
file descriptor onto its input buffer, and call the read callback.
When writing is enabled, the bufferevent will try to write data onto its
file descriptor when writing is enabled, and call the write callback
when the output buffer is sufficiently drained.
file descriptor when the output buffer has enough data, and call the write
callback when the output buffer is sufficiently drained.
Bufferevents come in several flavors, including:

16
include/event2/event.h
View File

@ -353,14 +353,14 @@ int event_reinit(struct event_base *base);
/**
Event dispatching loop
This loop will run the event base until either there are no more added
events, or until something calls event_base_loopbreak() or
This loop will run the event base until either there are no more pending or
active, or until something calls event_base_loopbreak() or
event_base_loopexit().
@param base the event_base structure returned by event_base_new() or
event_base_new_with_config()
@return 0 if successful, -1 if an error occurred, or 1 if no events were
registered.
@return 0 if successful, -1 if an error occurred, or 1 if we exited because
no events were pending or active.
@see event_base_loop()
*/
int event_base_dispatch(struct event_base *);
@ -762,15 +762,15 @@ int event_base_set(struct event_base *, struct event *);
This is a more flexible version of event_base_dispatch().
By default, this loop will run the event base until either there are no more
added events, or until something calls event_base_loopbreak() or
evenet_base_loopexit(). You can override this behavior with the 'flags'
pending or active events, or until something calls event_base_loopbreak() or
event_base_loopexit(). You can override this behavior with the 'flags'
argument.
@param eb the event_base structure returned by event_base_new() or
event_base_new_with_config()
@param flags any combination of EVLOOP_ONCE | EVLOOP_NONBLOCK
@return 0 if successful, -1 if an error occurred, or 1 if no events were
registered.
@return 0 if successful, -1 if an error occurred, or 1 if we exited because
no events were pending or active.
@see event_base_loopexit(), event_base_dispatch(), EVLOOP_ONCE,
EVLOOP_NONBLOCK
*/