Changeset 86bf047 for select.c

Timestamp:

Dec 11, 2008, 4:01:15 PM (16 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

ca1fc33a

Parents:

25cccdc

Message:

Clean up the timer dispatch logic and contract slightly.

File:

• select.c (modified) (1 diff)

select.c

@@ -44 +44 @@
     while(!g_sequence_iter_is_end(it)) {
         owl_timer *t = g_sequence_get(it);
-        int remove = 0;
+        void (*cb)(struct _owl_timer *, void *);
+        void *data;
 
         if(t->time > now)
             break;
 
+        cb = t->callback;
+        data = t->data;
+
         /* Reschedule if appropriate */
         if(t->interval > 0) {
-            t->time = now + t->interval;
-            g_sequence_sort_changed(it, (GCompareDataFunc)_owl_select_timer_cmp, NULL);
+          t->time = now + t->interval;
+          g_sequence_sort_changed(it, (GCompareDataFunc)_owl_select_timer_cmp, NULL);
         } else {
-            g_sequence_remove(it);
-            remove = 1;
+          owl_select_remove_timer(t);
+          t = NULL;
         }
 
         /* Do the callback */
-        t->callback(t, t->data);
-
-        if (remove) {
-            owl_free(t);
-        }
+        cb(t, data);
+
         it = g_sequence_get_begin_iter(owl_global_get_timerlist(&g));
     }