Changeset b7bb454 for select.c

Timestamp:

Dec 6, 2008, 5:39:49 PM (15 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:

7ce4003

Parents:

3ea31b6

git-author:

Nelson Elhage <nelhage@mit.edu> (12/06/08 17:36:19)

git-committer:

Nelson Elhage <nelhage@mit.edu> (12/06/08 17:39:49)

Message:

Make owl_timer have a callback and integrate into the select() loop.

Soon we should add support for registering timers from perl, and then
we can eventually remove the perl mainloop hook.

File:

• select.c (modified) (2 diffs)

select.c

@@ -2 +2 @@
 
 static const char fileIdent[] = "$Id: select.c 894 2008-01-17 07:13:44Z asedeno $";
+
+int _owl_select_timer_cmp(owl_timer *t1, owl_timer *t2, void *data) {
+    return t1->time - t2->time;
+}
+
+int _owl_select_timer_eq(owl_timer *t1, owl_timer *t2, void *data) {
+    return t1 == t2;
+}
+
+owl_timer *owl_select_add_timer(int after, int interval, void (*cb)(struct _owl_timer *, void *), void *data)
+{
+    owl_timer *t = owl_malloc(sizeof(owl_timer));
+    GSequence *timers = owl_global_get_timerlist(&g);
+
+    t->time = time(NULL) + after;
+    t->interval = interval;
+    t->callback = cb;
+    t->data = data;
+
+    g_sequence_insert_sorted(timers, t,
+                             (GCompareDataFunc)_owl_select_timer_cmp, NULL);
+    return t;
+}
+
+void owl_select_remove_timer(owl_timer *t)
+{
+    GSequenceIter *it = g_sequence_search(owl_global_get_timerlist(&g),
+                                          t, (GCompareDataFunc)_owl_select_timer_eq, NULL);
+    if(!g_sequence_iter_is_end(it) &&
+       g_sequence_get(it) == t) {
+        owl_free(t);
+        g_sequence_remove(it);
+    }
+}
+
+void owl_select_process_timers(struct timeval *timeout)
+{
+    time_t now = time(NULL);
+    GSequenceIter *it = g_sequence_get_begin_iter(owl_global_get_timerlist(&g));
+
+    while(!g_sequence_iter_is_end(it)) {
+        owl_timer *t = g_sequence_get(it);
+        int remove = 0;
+
+        if(t->time > now)
+            break;
+
+        /* Reschedule if appropriate */
+        if(t->interval > 0) {
+            t->time = now + t->interval;
+            g_sequence_sort_changed(it, (GCompareDataFunc)_owl_select_timer_cmp, NULL);
+        } else {
+            g_sequence_remove(it);
+            remove = 1;
+        }
+
+        /* Do the callback */
+        t->callback(t, t->data);
+
+        if (remove) {
+            owl_free(t);
+        }
+        it = g_sequence_get_begin_iter(owl_global_get_timerlist(&g));
+    }
+
+    if(g_sequence_iter_is_end(it)) {
+        timeout->tv_sec = 60;
+    } else {
+        owl_timer *t = g_sequence_get(it);
+        timeout->tv_sec = t->time - now;
+    }
+
+    timeout->tv_usec = 0;
+}
 
 /* Returns the index of the dispatch for the file descriptor. */
@@ -182 +256 @@
   struct timeval timeout;
 
-  timeout.tv_sec = 1;
-  timeout.tv_usec = 0;
+  owl_select_process_timers(&timeout);
 
   max_fd = owl_select_dispatch_prepare_fd_sets(&r, &e);