Changeset c675b39

Timestamp:

Dec 17, 2008, 3:24:25 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:

1631825

Parents:

e0096b7

git-author:

Nelson Elhage <nelhage@mit.edu> (12/15/08 21:26:36)

git-committer:

Nelson Elhage <nelhage@mit.edu> (12/17/08 15:24:25)

Message:

Give timers a destructor field.

Perl timers are going to need this in order to free the SV* callback
we're holding onto.

Files:

• aim.c (modified) (2 diffs)
• owl.c (modified) (1 diff)
• owl.h (modified) (1 diff)
• select.c (modified) (5 diffs)

aim.c

@@ -201 +201 @@
   owl_function_debugmsg("owl_aim_login: connecting");
 
-  g.aim_nop_timer = owl_select_add_timer(30, 30, owl_aim_send_nop, NULL);
+  g.aim_nop_timer = owl_select_add_timer(30, 30, owl_aim_send_nop, NULL, NULL);
 
   return(0);
@@ -227 +227 @@
   owl_global_set_ignore_aimlogin(&g);
   owl_select_add_timer(owl_global_get_aim_ignorelogin_timer(&g),
-                       0, owl_aim_unset_ignorelogin, NULL);
+                       0, owl_aim_unset_ignorelogin, NULL, NULL);
 
   /* aim_ssi_setpresence(owl_global_get_aimsess(&g), 0x00000400); */

owl.c

@@ -395 +395 @@
 
 
-  owl_select_add_timer(180, 180, owl_zephyr_buddycheck_timer, NULL);
+  owl_select_add_timer(180, 180, owl_zephyr_buddycheck_timer, NULL, NULL);
 
   /* If we ever deprecate the mainloop hook, remove this. */
-  owl_select_add_timer(0, 1, owl_perlconfig_mainloop, NULL);
+  owl_select_add_timer(0, 1, owl_perlconfig_mainloop, NULL, NULL);
 
 

owl.h

@@ -508 +508 @@
   int interval;
   void (*callback)(struct _owl_timer *, void *);
+  void (*destroy)(struct _owl_timer *);
   void *data;
 } owl_timer;

select.c

@@ -11 +11 @@
 }
 
-owl_timer *owl_select_add_timer(int after, int interval, void (*cb)(struct _owl_timer *, void *), void *data)
+owl_timer *owl_select_add_timer(int after, int interval, void (*cb)(owl_timer *, void *), void (*destroy)(owl_timer*), void *data)
 {
   owl_timer *t = owl_malloc(sizeof(owl_timer));
@@ -19 +19 @@
   t->interval = interval;
   t->callback = cb;
+  t->destroy = destroy;
   t->data = data;
 
@@ -31 +32 @@
   if (t && g_list_find(*timers, t)) {
     *timers = g_list_remove(*timers, t);
+    if(t->destroy) {
+      t->destroy(t);
+    }
     owl_free(t);
   }
@@ -42 +46 @@
   while(*timers) {
     owl_timer *t = (*timers)->data;
-    void (*cb)(struct _owl_timer *, void *);
-    void *data;
+    int remove = 0;
 
     if(t->time > now)
       break;
-
-    cb = t->callback;
-    data = t->data;
 
     /* Reschedule if appropriate */
@@ -58 +58 @@
                                      (GCompareFunc)_owl_select_timer_cmp);
     } else {
+      remove = 1;
+    }
+
+    /* Do the callback */
+    t->callback(t, t->data);
+    if(remove) {
       owl_select_remove_timer(t);
-      t = NULL;
-    }
-
-    /* Do the callback */
-    cb(t, data);
+    }
   }