Changeset 58d1f8a

Timestamp:

Dec 11, 2008, 10:21:13 PM (16 years ago)

Author:

Alejandro R. Sedeño <asedeno@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:

80a465c

Parents:

ca1fc33a

Message:

GSequence is newer than we'd like. Use GList for timers instead.

Files:

• global.c (modified) (2 diffs)
• owl.h (modified) (1 diff)
• select.c (modified) (7 diffs)

global.c

@@ -116 +116 @@
   owl_message_init_fmtext_cache();
   owl_list_create(&(g->dispatchlist));
-  g->timerlist = g_sequence_new(NULL);
+  g->timerlist = NULL;
 }
 
@@ -957 +957 @@
 }
 
-GSequence *owl_global_get_timerlist(owl_global *g)
-{
-    return g->timerlist;
-}
+GList **owl_global_get_timerlist(owl_global *g)
+{
+  return &(g->timerlist);
+}

owl.h

@@ -602 +602 @@
   owl_obarray obarray;
   owl_list dispatchlist;
-  GSequence *timerlist;
+  GList *timerlist;
   owl_timer *aim_nop_timer;
 } owl_global;

select.c

@@ -3 +3 @@
 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) {
+int _owl_select_timer_cmp(owl_timer *t1, owl_timer *t2) {
   return t1->time - t2->time;
 }
 
-int _owl_select_timer_eq(owl_timer *t1, owl_timer *t2, void *data) {
+int _owl_select_timer_eq(owl_timer *t1, owl_timer *t2) {
   return t1 == t2;
 }
@@ -14 +14 @@
 {
   owl_timer *t = owl_malloc(sizeof(owl_timer));
-  GSequence *timers = owl_global_get_timerlist(&g);
+  GList **timers = owl_global_get_timerlist(&g);
 
   t->time = time(NULL) + after;
@@ -21 +21 @@
   t->data = data;
 
-  g_sequence_insert_sorted(timers, t,
-                           (GCompareDataFunc)_owl_select_timer_cmp, NULL);
+  *timers = g_list_insert_sorted(*timers, t,
+                                 (GCompareFunc)_owl_select_timer_cmp);
   return t;
 }
@@ -28 +28 @@
 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) {
+  GList **timers = owl_global_get_timerlist(&g);
+  if (t && g_list_find(*timers, t)) {
+    *timers = g_list_remove(*timers, t);
     owl_free(t);
-    g_sequence_remove(it);
   }
 }
@@ -40 +38 @@
 {
   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);
+  GList **timers = owl_global_get_timerlist(&g);
+
+  while(*timers) {
+    owl_timer *t = (*timers)->data;
     void (*cb)(struct _owl_timer *, void *);
     void *data;
@@ -56 +54 @@
     if(t->interval > 0) {
       t->time = now + t->interval;
-      g_sequence_sort_changed(it, (GCompareDataFunc)_owl_select_timer_cmp, NULL);
+      *timers = g_list_remove(*timers, t);
+      *timers = g_list_insert_sorted(*timers, t,
+                                     (GCompareFunc)_owl_select_timer_cmp);
     } else {
       owl_select_remove_timer(t);
@@ -64 +64 @@
     /* Do the callback */
     cb(t, data);
-
-    it = g_sequence_get_begin_iter(owl_global_get_timerlist(&g));
-  }
-
-  if(g_sequence_iter_is_end(it)) {
+  }
+
+  if(*timers) {
+    owl_timer *t = (*timers)->data;
+    timeout->tv_sec = t->time - now;
+    if (timeout->tv_sec > 60)
+      timeout->tv_sec = 60;
+  } else {
     timeout->tv_sec = 60;
-  } else {
-    owl_timer *t = g_sequence_get(it);
-    timeout->tv_sec = t->time - now;
   }