r9702: r9680@blu: tridge | 2005-08-27 18:45:08 +1000

[bbaumbach/samba-autobuild/.git] / source4 / lib / events / events_standard.c

diff --git a/source4/lib/events/events_standard.c b/source4/lib/events/events_standard.c
index a867f86801c7457fac7bcd400f3029010eb9a522..810e8bbca30ec67f9e06c16ec7c6aa27d823bf1f 100644 (file)
--- a/source4/lib/events/events_standard.c
+++ b/source4/lib/events/events_standard.c
@@ -311,7 +311,8 @@ static struct timed_event *std_event_add_timed(struct event_context *ev, TALLOC_
        for (cur_te = std_ev->timed_events; cur_te; cur_te = cur_te->next) {
                /* if the new event comes before the current one break */
                if (!timeval_is_zero(&cur_te->next_event) &&
-                   timeval_compare(&cur_te->next_event, &te->next_event) < 0) {
+                   timeval_compare(&te->next_event,
+                                   &cur_te->next_event) < 0) {
                        break;
                }
 
@@ -335,6 +336,10 @@ static void std_event_loop_timer(struct event_context *ev)
        struct timeval t = timeval_current();
        struct timed_event *te = std_ev->timed_events;
 
+       if (te == NULL) {
+               return;
+       }
+
        te->next_event = timeval_zero();
 
        te->handler(ev, te, t, te->private_data);
@@ -479,31 +484,32 @@ static int std_event_loop_once(struct event_context *ev)
 {
        struct std_event_context *std_ev = talloc_get_type(ev->additional_data,
                                                           struct std_event_context);
-       struct timeval tval, *tvalp;
-
-       tvalp = NULL;
+       struct timeval tval;
 
        /* work out the right timeout for all timed events */
        if (std_ev->timed_events) {
                struct timeval t = timeval_current();
-
-               tval = timeval_diff(&std_ev->timed_events->next_event, &t);
-               tvalp = &tval;
-               if (timeval_is_zero(tvalp)) {
+               tval = timeval_until(&t, &std_ev->timed_events->next_event);
+               if (timeval_is_zero(&tval)) {
                        std_event_loop_timer(ev);
                        return 0;
                }
+       } else {
+               /* have a default tick time of 30 seconds. This guarantees
+                  that code that uses its own timeout checking will be
+                  able to proceeed eventually */
+               tval = timeval_set(30, 0);
        }
 
 #if WITH_EPOLL
        if (std_ev->epoll_fd != -1) {
-               if (std_event_loop_epoll(ev, tvalp) == 0) {
+               if (std_event_loop_epoll(ev, &tval) == 0) {
                        return 0;
                }
        }
 #endif
 
-       return std_event_loop_select(ev, tvalp);
+       return std_event_loop_select(ev, &tval);
 }
 
 /*