summaryrefslogtreecommitdiff
path: root/lib/tevent
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-03-16 12:45:48 +0100
committerStefan Metzmacher <metze@samba.org>2009-03-17 19:58:56 +0100
commit0139befb915006d6ec9fec2734057c5c50b3c383 (patch)
tree8219fac1fdbc96b984f2a561634daaf47c62c7d4 /lib/tevent
parent3af7db3dce0e5529114f6969e9905c6d4c65dfe8 (diff)
downloadsamba-0139befb915006d6ec9fec2734057c5c50b3c383.tar.gz
samba-0139befb915006d6ec9fec2734057c5c50b3c383.tar.bz2
samba-0139befb915006d6ec9fec2734057c5c50b3c383.zip
tevent: check signal events first in event_loop_once
We also check for signal events directly before and after the select/epoll calls. metze
Diffstat (limited to 'lib/tevent')
-rw-r--r--lib/tevent/tevent_epoll.c5
-rw-r--r--lib/tevent/tevent_select.c5
-rw-r--r--lib/tevent/tevent_standard.c5
3 files changed, 15 insertions, 0 deletions
diff --git a/lib/tevent/tevent_epoll.c b/lib/tevent/tevent_epoll.c
index 38a14883cc..6c960c7491 100644
--- a/lib/tevent/tevent_epoll.c
+++ b/lib/tevent/tevent_epoll.c
@@ -404,6 +404,11 @@ static int epoll_event_loop_once(struct tevent_context *ev, const char *location
struct epoll_event_context);
struct timeval tval;
+ if (epoll_ev->ev->signal_events &&
+ tevent_common_check_signal(epoll_ev->ev)) {
+ return 0;
+ }
+
tval = tevent_common_loop_timer_delay(ev);
if (tevent_timeval_is_zero(&tval)) {
return 0;
diff --git a/lib/tevent/tevent_select.c b/lib/tevent/tevent_select.c
index bbbb95fce8..b666b4fba4 100644
--- a/lib/tevent/tevent_select.c
+++ b/lib/tevent/tevent_select.c
@@ -210,6 +210,11 @@ static int select_event_loop_once(struct tevent_context *ev, const char *locatio
struct select_event_context);
struct timeval tval;
+ if (select_ev->ev->signal_events &&
+ tevent_common_check_signal(select_ev->ev)) {
+ return 0;
+ }
+
tval = tevent_common_loop_timer_delay(ev);
if (tevent_timeval_is_zero(&tval)) {
return 0;
diff --git a/lib/tevent/tevent_standard.c b/lib/tevent/tevent_standard.c
index 0ee99ca56b..40a08d7ab0 100644
--- a/lib/tevent/tevent_standard.c
+++ b/lib/tevent/tevent_standard.c
@@ -524,6 +524,11 @@ static int std_event_loop_once(struct tevent_context *ev, const char *location)
struct std_event_context);
struct timeval tval;
+ if (std_ev->ev->signal_events &&
+ tevent_common_check_signal(std_ev->ev)) {
+ return 0;
+ }
+
tval = tevent_common_loop_timer_delay(ev);
if (tevent_timeval_is_zero(&tval)) {
return 0;