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

Document internal evmap functions, add a couple of asserts, and fix up some things that did not need to be void* any more

Browse Source 
svn:r987
This commit is contained in:
Nick Mathewson 2009-01-09 05:01:48 +00:00
parent 980bcd68f7
commit 8f5777e692
2 changed files with 62 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
evmap.c
View File

@ -56,8 +56,15 @@
#include "evmap.h"
#include "mm-internal.h"
/* Set the variable 'x' to the field in event_map 'map' with fields of type
'struct type *' corresponding to the fd or signal 'slot'. Set 'x' to NULL
if there are no entries for 'slot'. Does no bounds-checking. */
#define GET_SLOT(x, map, slot, type) \
(x) = (struct type *)((map)->entries[slot])
/* As GET_SLOT, but construct the entry for 'slot' if it is not present,
by allocating enough memory for a 'struct type', and initializing the new
value by calling the function 'ctor' on it.
*/
#define GET_SLOT_AND_CTOR(x, map, slot, type, ctor) \
do { \
if ((map)->entries[slot] == NULL) { \
@ -69,6 +76,9 @@
(x) = (struct type *)((map)->entries[slot]); \
} while (0) \
/** Expand 'map' with new entries of width 'msize' until it is big enough
to store a value in 'slot'.
*/
static int
evmap_make_space(struct event_map *map, int slot, int msize)
{
@ -111,17 +121,19 @@ evmap_clear(struct event_map *ctx)
/* code specific to file descriptors */
/** An entry for an evmap_io list: notes all the events that want to read or
write on a given fd, and the number of each.
*/
struct evmap_io {
struct event_list events;
unsigned int nread;
unsigned int nwrite;
};
/** Constructor for struct evmap_io */
static void
evmap_io_init(void *arg)
evmap_io_init(struct evmap_io *entry)
{
struct evmap_io *entry = arg;
TAILQ_INIT(&entry->events);
entry->nread = 0;
entry->nwrite = 0;
@ -137,6 +149,10 @@ evmap_io_add(struct event_base *base, int fd, struct event *ev)
int nread, nwrite;
short res = 0, old = 0;
assert(fd == ev->ev_fd); /*XXX(nickm) always true? */
/*XXX(nickm) Should we assert that ev is not already inserted, or should
* we make this function idempotent? */
if (fd >= io->nentries) {
if (evmap_make_space(io, fd, sizeof(struct evmap_io)) == -1)
return (-1);
@ -185,6 +201,10 @@ evmap_io_del(struct event_base *base, int fd, struct event *ev)
int nread, nwrite;
short res = 0, old = 0;
assert(fd == ev->ev_fd); /*XXX(nickm) always true? */
/*XXX(nickm) Should we assert that ev is not already inserted, or should
* we make this function idempotent? */
if (fd >= io->nentries)
return (-1);
@ -231,6 +251,7 @@ evmap_io_active(struct event_base *base, int fd, short events)
assert(fd < io->nentries);
GET_SLOT(ctx, io, fd, evmap_io);
assert(ctx);
TAILQ_FOREACH(ev, &ctx->events, ev_io_next) {
if (ev->ev_events & events)
event_active(ev, ev->ev_events & events, 1);
@ -244,10 +265,8 @@ struct evmap_signal {
};
static void
evmap_signal_init(void *arg)
evmap_signal_init(struct evmap_signal *entry)
{
struct evmap_signal *entry = arg;
TAILQ_INIT(&entry->events);
}

33
evmap.h
View File

@ -27,14 +27,47 @@
#ifndef _EVMAP_H_
#define _EVMAP_H_
/** @file evmap.h
*
* An event_map is a utility structure to map each fd or signal to zero or
* more events. Functions to manipulate event_maps should only be used from
* inside libevent.
**/
struct event_map;
struct event_base;
struct event;
/** Remove all entries from an event_map.
@param ctx the map to clear.
*/
void evmap_clear(struct event_map* ctx);
/** Add 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
underlying eventops about the fd if its state has changed.
@param base the event_base to operate on.
@param fd the file descriptor corresponding to ev.
@param ev the event to add.
*/
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
event_base's list of events on a given file descriptor, and tell the
underlying eventops about the fd if its state has changed.
@param base the event_base to operate on.
@param fd the file descriptor corresponding to ev.
@param ev the event to remove.
*/
int evmap_io_del(struct event_base *base, evutil_socket_t fd, struct event *ev);
/** Active the set of events waiting on an event_base for a given fd.
@param base the event_base to operate on.
@param fd the file descriptor that has become active.
@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);
int evmap_signal_add(struct event_base *base, int signum, struct event *ev);