diff options
Diffstat (limited to 'lib/tevent/tevent_epoll.c')
-rw-r--r-- | lib/tevent/tevent_epoll.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/lib/tevent/tevent_epoll.c b/lib/tevent/tevent_epoll.c index cff6e46e2c..1ce666462c 100644 --- a/lib/tevent/tevent_epoll.c +++ b/lib/tevent/tevent_epoll.c @@ -30,10 +30,10 @@ struct epoll_event_context { /* a pointer back to the generic event_context */ - struct event_context *ev; + struct tevent_context *ev; /* list of filedescriptor events */ - struct fd_event *fd_events; + struct tevent_fd *fd_events; /* number of registered fd event handlers */ int num_fd_events; @@ -98,7 +98,7 @@ static int epoll_init_ctx(struct epoll_event_context *epoll_ev) return 0; } -static void epoll_add_event(struct epoll_event_context *epoll_ev, struct fd_event *fde); +static void epoll_add_event(struct epoll_event_context *epoll_ev, struct tevent_fd *fde); /* reopen the epoll handle when our pid changes @@ -107,7 +107,7 @@ static void epoll_add_event(struct epoll_event_context *epoll_ev, struct fd_even */ static void epoll_check_reopen(struct epoll_event_context *epoll_ev) { - struct fd_event *fde; + struct tevent_fd *fde; if (epoll_ev->pid == getpid()) { return; @@ -133,7 +133,7 @@ static void epoll_check_reopen(struct epoll_event_context *epoll_ev) /* add the epoll event to the given fd_event */ -static void epoll_add_event(struct epoll_event_context *epoll_ev, struct fd_event *fde) +static void epoll_add_event(struct epoll_event_context *epoll_ev, struct tevent_fd *fde) { struct epoll_event event; @@ -161,7 +161,7 @@ static void epoll_add_event(struct epoll_event_context *epoll_ev, struct fd_even /* delete the epoll event for given fd_event */ -static void epoll_del_event(struct epoll_event_context *epoll_ev, struct fd_event *fde) +static void epoll_del_event(struct epoll_event_context *epoll_ev, struct tevent_fd *fde) { struct epoll_event event; @@ -186,7 +186,7 @@ static void epoll_del_event(struct epoll_event_context *epoll_ev, struct fd_even /* change the epoll event to the given fd_event */ -static void epoll_mod_event(struct epoll_event_context *epoll_ev, struct fd_event *fde) +static void epoll_mod_event(struct epoll_event_context *epoll_ev, struct tevent_fd *fde) { struct epoll_event event; if (epoll_ev->epoll_fd == -1) return; @@ -206,7 +206,7 @@ static void epoll_mod_event(struct epoll_event_context *epoll_ev, struct fd_even } } -static void epoll_change_event(struct epoll_event_context *epoll_ev, struct fd_event *fde) +static void epoll_change_event(struct epoll_event_context *epoll_ev, struct tevent_fd *fde) { bool got_error = (fde->additional_flags & EPOLL_ADDITIONAL_FD_FLAG_GOT_ERROR); bool want_read = (fde->flags & EVENT_FD_READ); @@ -282,8 +282,8 @@ static int epoll_event_loop(struct epoll_event_context *epoll_ev, struct timeval } for (i=0;i<ret;i++) { - struct fd_event *fde = talloc_get_type(events[i].data.ptr, - struct fd_event); + struct tevent_fd *fde = talloc_get_type(events[i].data.ptr, + struct tevent_fd); uint16_t flags = 0; if (fde == NULL) { @@ -320,7 +320,7 @@ static int epoll_event_loop(struct epoll_event_context *epoll_ev, struct timeval /* create a epoll_event_context structure. */ -static int epoll_event_context_init(struct event_context *ev) +static int epoll_event_context_init(struct tevent_context *ev) { int ret; struct epoll_event_context *epoll_ev; @@ -343,9 +343,9 @@ static int epoll_event_context_init(struct event_context *ev) /* destroy an fd_event */ -static int epoll_event_fd_destructor(struct fd_event *fde) +static int epoll_event_fd_destructor(struct tevent_fd *fde) { - struct event_context *ev = fde->event_ctx; + struct tevent_context *ev = fde->event_ctx; struct epoll_event_context *epoll_ev = talloc_get_type(ev->additional_data, struct epoll_event_context); @@ -370,18 +370,18 @@ static int epoll_event_fd_destructor(struct fd_event *fde) add a fd based event return NULL on failure (memory allocation error) */ -static struct fd_event *epoll_event_add_fd(struct event_context *ev, TALLOC_CTX *mem_ctx, +static struct tevent_fd *epoll_event_add_fd(struct tevent_context *ev, TALLOC_CTX *mem_ctx, int fd, uint16_t flags, event_fd_handler_t handler, void *private_data) { struct epoll_event_context *epoll_ev = talloc_get_type(ev->additional_data, struct epoll_event_context); - struct fd_event *fde; + struct tevent_fd *fde; epoll_check_reopen(epoll_ev); - fde = talloc(mem_ctx?mem_ctx:ev, struct fd_event); + fde = talloc(mem_ctx?mem_ctx:ev, struct tevent_fd); if (!fde) return NULL; fde->event_ctx = ev; @@ -405,7 +405,7 @@ static struct fd_event *epoll_event_add_fd(struct event_context *ev, TALLOC_CTX /* return the fd event flags */ -static uint16_t epoll_event_get_fd_flags(struct fd_event *fde) +static uint16_t epoll_event_get_fd_flags(struct tevent_fd *fde) { return fde->flags; } @@ -413,9 +413,9 @@ static uint16_t epoll_event_get_fd_flags(struct fd_event *fde) /* set the fd event flags */ -static void epoll_event_set_fd_flags(struct fd_event *fde, uint16_t flags) +static void epoll_event_set_fd_flags(struct tevent_fd *fde, uint16_t flags) { - struct event_context *ev; + struct tevent_context *ev; struct epoll_event_context *epoll_ev; if (fde->flags == flags) return; @@ -433,7 +433,7 @@ static void epoll_event_set_fd_flags(struct fd_event *fde, uint16_t flags) /* do a single event loop using the events defined in ev */ -static int epoll_event_loop_once(struct event_context *ev) +static int epoll_event_loop_once(struct tevent_context *ev) { struct epoll_event_context *epoll_ev = talloc_get_type(ev->additional_data, struct epoll_event_context); @@ -452,7 +452,7 @@ static int epoll_event_loop_once(struct event_context *ev) /* return on failure or (with 0) if all fd events are removed */ -static int epoll_event_loop_wait(struct event_context *ev) +static int epoll_event_loop_wait(struct tevent_context *ev) { struct epoll_event_context *epoll_ev = talloc_get_type(ev->additional_data, struct epoll_event_context); |