cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-08-04 01:36:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add a few more evmap/changelist comments

Browse Source
This commit is contained in:
Nick Mathewson 2010-04-09 13:32:08 -04:00
parent c87272b7b9
commit c247adc79c
3 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelist-internal.h
View File

@ -88,7 +88,7 @@ void event_changelist_init(struct event_changelist *changelist);
* after making all the changes in the changelist. */ * after making all the changes in the changelist. */
void event_changelist_remove_all(struct event_changelist *changelist, void event_changelist_remove_all(struct event_changelist *changelist,
struct event_base *base); struct event_base *base);
/** Free all memory held in a changelist, and return it. */ /** Free all memory held in a changelist. */
void event_changelist_freemem(struct event_changelist *changelist); void event_changelist_freemem(struct event_changelist *changelist);
/** Implementation of eventop_add that queues the event in a changelist. */ /** Implementation of eventop_add that queues the event in a changelist. */

12
evmap-internal.h
View File

@ -53,10 +53,12 @@ void evmap_signal_clear(struct event_signal_map* ctx);
event_base's list of events on a given file descriptor, and tell the event_base's list of events on a given file descriptor, and tell the
underlying eventops about the fd if its state has changed. underlying eventops about the fd if its state has changed.
Requires that ev is not already added.
@param base the event_base to operate on. @param base the event_base to operate on.
@param fd the file descriptor corresponding to ev. @param fd the file descriptor corresponding to ev.
@param ev the event to add. @param ev the event to add.
*/ */
int evmap_io_add(struct event_base *base, evutil_socket_t fd, struct event *ev); int evmap_io_add(struct event_base *base, evutil_socket_t fd, struct event *ev);
/** Remove an IO event (some combination of EV_READ or EV_WRITE) to an /** Remove an IO event (some combination of EV_READ or EV_WRITE) to an
event_base's list of events on a given file descriptor, and tell the event_base's list of events on a given file descriptor, and tell the
@ -72,12 +74,16 @@ int evmap_io_del(struct event_base *base, evutil_socket_t fd, struct event *ev);
@param base the event_base to operate on. @param base the event_base to operate on.
@param fd the file descriptor that has become active. @param fd the file descriptor that has become active.
@param events a bitmask of EV_READ|EV_WRITE|EV_ET. @param events a bitmask of EV_READ|EV_WRITE|EV_ET.
*/ */
void evmap_io_active(struct event_base *base, evutil_socket_t fd, short events); void evmap_io_active(struct event_base *base, evutil_socket_t fd, short events);
/* These functions behave in the same way as evmap_io_*, except they work on
* signals rather than fds. signals use a linear map everywhere; fds use
* either a linear map or a hashtable. */
int evmap_signal_add(struct event_base *base, int signum, struct event *ev); int evmap_signal_add(struct event_base *base, int signum, struct event *ev);
int evmap_signal_del(struct event_base *base, int signum, struct event *ev); int evmap_signal_del(struct event_base *base, int signum, struct event *ev);
void evmap_signal_active(struct event_base *base, evutil_socket_t fd, int ncalls); void evmap_signal_active(struct event_base *base, evutil_socket_t signum, int ncalls);
void *evmap_io_get_fdinfo(struct event_io_map *ctx, evutil_socket_t fd); void *evmap_io_get_fdinfo(struct event_io_map *ctx, evutil_socket_t fd);

21
evmap.c
View File

@ -83,6 +83,8 @@ struct event_map_entry {
} ent; } ent;
}; };
/* Helper used by the event_io_map hashtable code; tries to return a good hash
* of the fd in e->fd. */
static inline unsigned static inline unsigned
hashsocket(struct event_map_entry *e) hashsocket(struct event_map_entry *e)
{ {
@ -94,6 +96,8 @@ hashsocket(struct event_map_entry *e)
return h; return h;
} }
/* Helper used by the event_io_map hashtable code; returns true iff e1 and e2
* have the same e->fd. */
static inline int static inline int
eqsocket(struct event_map_entry *e1, struct event_map_entry *e2) eqsocket(struct event_map_entry *e1, struct event_map_entry *e2)
{ {
@ -261,9 +265,7 @@ evmap_io_add(struct event_base *base, evutil_socket_t fd, struct event *ev)
int nread, nwrite, retval = 0; int nread, nwrite, retval = 0;
short res = 0, old = 0; short res = 0, old = 0;
EVUTIL_ASSERT(fd == ev->ev_fd); /*XXX(nickm) always true? */ EVUTIL_ASSERT(fd == ev->ev_fd);
/*XXX(nickm) Should we assert that ev is not already inserted, or should
* we make this function idempotent? */
if (fd < 0) if (fd < 0)
return 0; return 0;
@ -326,9 +328,7 @@ evmap_io_del(struct event_base *base, evutil_socket_t fd, struct event *ev)
if (fd < 0) if (fd < 0)
return 0; return 0;
EVUTIL_ASSERT(fd == ev->ev_fd); /*XXX(nickm) always true? */ EVUTIL_ASSERT(fd == ev->ev_fd);
/*XXX(nickm) Should we assert that ev is not already inserted, or should
* we make this function idempotent? */
#ifndef EVMAP_USE_HT #ifndef EVMAP_USE_HT
if (fd >= io->nentries) if (fd >= io->nentries)
@ -674,11 +674,12 @@ event_changelist_del(struct event_base *base, evutil_socket_t fd, short old, sho
/* A delete removes any previous add, rather than replacing it: /* A delete removes any previous add, rather than replacing it:
on those platforms where "add, delete, dispatch" is not the same on those platforms where "add, delete, dispatch" is not the same
as "no-op" dispatch, we want the no-op behavior. as "no-op, dispatch", we want the no-op behavior.
If we have a no-op item, we could it from the list entirely, but If we have a no-op item, we could remove it it from the list
really there's not much point: skipping the no-op change when we do entirely, but really there's not much point: skipping the no-op
the dispatch later is far cheaper than rejuggling the array now. change when we do the dispatch later is far cheaper than rejuggling
the array now.
*/ */
if (events & (EV_READ|EV_SIGNAL)) { if (events & (EV_READ|EV_SIGNAL)) {