diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-02-09 13:16:55 +1100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2012-02-16 15:49:21 -0800 |
| commit | 367c567c5f35db202474c8d3f730484538e1fb97 (patch) | |
| tree | 6d4a05b6e2f2923fec8564d360eb7085a831d128 /source3/lib/events.c | |
| parent | ab80995580f092811d6380caa9e71e4c5fda06f4 (diff) | |
| download | samba-367c567c5f35db202474c8d3f730484538e1fb97.tar.gz samba-367c567c5f35db202474c8d3f730484538e1fb97.tar.bz2 samba-367c567c5f35db202474c8d3f730484538e1fb97.zip | |
lib/util: Remove sys_poll as it is no longer needed
sys_poll() is only needed if the signal pipe is set up and used, but as
no signal handler ever writes to the pipe, this can all be removed.
signal based events are now handled via tevent.
Andrew Bartlett
Signed-off-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/lib/events.c')
| -rw-r--r-- | source3/lib/events.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/source3/lib/events.c b/source3/lib/events.c index 77589f8e7e..c71876ce39 100644 --- a/source3/lib/events.c +++ b/source3/lib/events.c @@ -101,14 +101,9 @@ bool event_add_to_poll_args(struct tevent_context *ev, TALLOC_CTX *mem_ctx, fds = *pfds; num_pollfds = *pnum_pfds; - /* - * The +1 is for the sys_poll calling convention. It expects - * an array 1 longer for the signal pipe - */ - - if (talloc_array_length(fds) < num_pollfds + num_fds + 1) { + if (talloc_array_length(fds) < num_pollfds + num_fds) { fds = talloc_realloc(mem_ctx, fds, struct pollfd, - num_pollfds + num_fds + 1); + num_pollfds + num_fds); if (fds == NULL) { DEBUG(10, ("talloc_realloc failed\n")); return false; @@ -338,7 +333,7 @@ static int s3_event_loop_once(struct tevent_context *ev, const char *location) return -1; } - ret = sys_poll(state->pfds, num_pfds, timeout); + ret = poll(state->pfds, num_pfds, timeout); if (ret == -1 && errno != EINTR) { tevent_debug(ev, TEVENT_DEBUG_FATAL, "poll() failed: %d:%s\n", |