diff options
author | Stefan Metzmacher <metze@samba.org> | 2009-01-05 16:55:00 +0100 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2009-01-05 22:44:53 +0100 |
commit | b24924d6a6438b361fb903227bd56d2afe40d2f2 (patch) | |
tree | 15df37d6f6209ba298055a97d45edb158de62fd6 /lib/tevent/tevent_standard.c | |
parent | a99f76960d9f326663d26d15aa0bf57f6ea3927f (diff) | |
download | samba-b24924d6a6438b361fb903227bd56d2afe40d2f2.tar.gz samba-b24924d6a6438b361fb903227bd56d2afe40d2f2.tar.bz2 samba-b24924d6a6438b361fb903227bd56d2afe40d2f2.zip |
tevent: keep a linked list of signal events
metze
Diffstat (limited to 'lib/tevent/tevent_standard.c')
-rw-r--r-- | lib/tevent/tevent_standard.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/tevent/tevent_standard.c b/lib/tevent/tevent_standard.c index 2a292a4c39..2d8a2305d9 100644 --- a/lib/tevent/tevent_standard.c +++ b/lib/tevent/tevent_standard.c @@ -264,14 +264,14 @@ static int epoll_event_loop(struct std_event_context *std_ev, struct timeval *tv timeout = ((tvalp->tv_usec+999) / 1000) + (tvalp->tv_sec*1000); } - if (std_ev->ev->num_signal_handlers && + if (std_ev->ev->signal_events && tevent_common_check_signal(std_ev->ev)) { return 0; } ret = epoll_wait(std_ev->epoll_fd, events, MAXEVENTS, timeout); - if (ret == -1 && errno == EINTR && std_ev->ev->num_signal_handlers) { + if (ret == -1 && errno == EINTR && std_ev->ev->signal_events) { if (tevent_common_check_signal(std_ev->ev)) { return 0; } @@ -490,7 +490,7 @@ static int std_event_loop_select(struct std_event_context *std_ev, struct timeva } } - if (std_ev->ev->num_signal_handlers && + if (std_ev->ev->signal_events && tevent_common_check_signal(std_ev->ev)) { return 0; } @@ -498,7 +498,7 @@ static int std_event_loop_select(struct std_event_context *std_ev, struct timeva selrtn = select(std_ev->maxfd+1, &r_fds, &w_fds, NULL, tvalp); if (selrtn == -1 && errno == EINTR && - std_ev->ev->num_signal_handlers) { + std_ev->ev->signal_events) { tevent_common_check_signal(std_ev->ev); return 0; } |