Changeset 232 for branches/samba-3.2.x/source/lib/events.c

Timestamp:

May 27, 2009, 9:09:42 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.8

File:

• branches/samba-3.2.x/source/lib/events.c (modified) (7 diffs)

branches/samba-3.2.x/source/lib/events.c

@@ -64 +64 @@
         DEBUG(10, ("Destroying timed event %lx \"%s\"\n", (unsigned long)te,
                 te->event_name));
-        DLIST_REMOVE(te->event_ctx->timed_events, te);
+        if (te->event_ctx) {
+                DLIST_REMOVE(te->event_ctx->timed_events, te);
+        }
         return 0;
 }
@@ -134 +136 @@
         struct event_context *event_ctx = fde->event_ctx;
 
-        DLIST_REMOVE(event_ctx->fd_events, fde);
+        if (event_ctx) {
+                DLIST_REMOVE(event_ctx->fd_events, fde);
+        }
         return 0;
 }
@@ -242 +246 @@
                 int selrtn, fd_set *read_fds, fd_set *write_fds)
 {
-        bool fired = False;
-        struct fd_event *fde, *next;
-
-        /* Run all events that are pending, not just one (as we
-           did previously. */
-
-        while (event_ctx->timed_events) {
-                struct timeval now;
-                GetTimeOfDay(&now);
-
-                if (timeval_compare(
-                            &now, &event_ctx->timed_events->when) < 0) {
-                        /* Nothing to do yet */
-                        DEBUG(11, ("run_events: Nothing to do\n"));
-                        break;
-                }
+        struct fd_event *fde;
+        struct timeval now;
+
+        GetTimeOfDay(&now);
+
+        if ((event_ctx->timed_events != NULL)
+            && (timeval_compare(&now, &event_ctx->timed_events->when) >= 0)) {
 
                 DEBUG(10, ("Running event \"%s\" %lx\n",
@@ -268 +263 @@
                         event_ctx->timed_events->private_data);
 
-                fired = True;
-        }
-
-        if (fired) {
-                /*
-                 * We might have changed the socket status during the timed
-                 * events, return to run select again.
-                 */
-                return True;
+                return true;
         }
 
@@ -283 +270 @@
                  * No fd ready
                  */
-                return fired;
-        }
-
-        for (fde = event_ctx->fd_events; fde; fde = next) {
+                return false;
+        }
+
+        for (fde = event_ctx->fd_events; fde; fde = fde->next) {
                 uint16 flags = 0;
 
-                next = fde->next;
                 if (FD_ISSET(fde->fd, read_fds)) flags |= EVENT_FD_READ;
                 if (FD_ISSET(fde->fd, write_fds)) flags |= EVENT_FD_WRITE;
@@ -295 +281 @@
                 if (flags) {
                         fde->handler(event_ctx, fde, flags, fde->private_data);
-                        fired = True;
-                }
-        }
-
-        return fired;
+                        return true;
+                }
+        }
+
+        return false;
 }
 
@@ -355 +341 @@
 }
 
+static int event_context_destructor(struct event_context *ev)
+{
+        while (ev->fd_events != NULL) {
+                ev->fd_events->event_ctx = NULL;
+                DLIST_REMOVE(ev->fd_events, ev->fd_events);
+        }
+        while (ev->timed_events != NULL) {
+                ev->timed_events->event_ctx = NULL;
+                DLIST_REMOVE(ev->timed_events, ev->timed_events);
+        }
+        return 0;
+}
+
+void event_context_reinit(struct event_context *ev)
+{
+        event_context_destructor(ev);
+        return;
+}
+
 struct event_context *event_context_init(TALLOC_CTX *mem_ctx)
 {
-        return TALLOC_ZERO_P(NULL, struct event_context);
-}
-
-int set_event_dispatch_time(struct event_context *event_ctx,
-                            const char *event_name, struct timeval when)
-{
-        struct timed_event *te;
-
-        for (te = event_ctx->timed_events; te; te = te->next) {
-                if (strcmp(event_name, te->event_name) == 0) {
-                        DLIST_REMOVE(event_ctx->timed_events, te);
-                        te->when = when;
-                        add_event_by_time(te);
-                        return 1;
-                }
-        }
-        return 0;
-}
-
-/* Returns 1 if event was found and cancelled, 0 otherwise. */
-
-int cancel_named_event(struct event_context *event_ctx,
-                       const char *event_name)
-{
-        struct timed_event *te;
-
-        for (te = event_ctx->timed_events; te; te = te->next) {
-                if (strcmp(event_name, te->event_name) == 0) {
-                        TALLOC_FREE(te);
-                        return 1;
-                }
-        }
-        return 0;
+        struct event_context *result;
+
+        result = TALLOC_ZERO_P(mem_ctx, struct event_context);
+        if (result == NULL) {
+                return NULL;
+        }
+
+        talloc_set_destructor(result, event_context_destructor);
+        return result;
 }