From 336ae458e9f648625f8fe438bf1dc4c8f7e616a7 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 21 Jan 2007 08:23:14 +0000 Subject: r20928: added signal events to lib/events Jeremy asked for this to allow Samba3 to use the Samba4 events library see torture/local/event.c for an example (This used to be commit 7e105482ff9a3da6b4708ff99a64f1881614fc5f) --- source4/lib/events/events_select.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'source4/lib/events/events_select.c') diff --git a/source4/lib/events/events_select.c b/source4/lib/events/events_select.c index 5f4ecba5ca..ea84353183 100644 --- a/source4/lib/events/events_select.c +++ b/source4/lib/events/events_select.c @@ -197,8 +197,19 @@ static int select_event_loop_select(struct select_event_context *select_ev, stru } } + if (select_ev->ev->num_signal_handlers && + common_event_check_signal(select_ev->ev)) { + return 0; + } + selrtn = select(select_ev->maxfd+1, &r_fds, &w_fds, NULL, tvalp); + if (selrtn == -1 && errno == EINTR && + select_ev->ev->num_signal_handlers) { + common_event_check_signal(select_ev->ev); + return 0; + } + if (selrtn == -1 && errno == EBADF) { /* the socket is dead! this should never happen as the socket should have first been @@ -279,6 +290,7 @@ static const struct event_ops select_event_ops = { .get_fd_flags = select_event_get_fd_flags, .set_fd_flags = select_event_set_fd_flags, .add_timed = common_event_add_timed, + .add_signal = common_event_add_signal, .loop_once = select_event_loop_once, .loop_wait = select_event_loop_wait, }; -- cgit