Changeset 6dc3757

Timestamp:

Jun 11, 2011, 6:31:32 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Children:

89fe67e

Parents:

db4f7c3

git-author:

David Benjamin <davidben@mit.edu> (05/23/11 23:43:21)

git-committer:

David Benjamin <davidben@mit.edu> (06/11/11 18:31:32)

Message:

Convert AIM timers to glib timers

We do lose the timer tracking feature, but I think that's fine. Glib
does have some main loop debug spew to run, though admittedly it may
require a custom-built glib.

Glib 2.14 allows us to use g_timeout_add_seconds which synchronizes
wakeups at the seconds granularity to minimize CPU wakeups.

Files:

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

aim.c

@@ -113 +113 @@
 }
 
-void owl_aim_send_nop(owl_timer *t, void *data) {
-    if(owl_global_is_doaimevents(&g)) {
-        aim_session_t *sess = owl_global_get_aimsess(&g);
-        aim_flap_nop(sess, aim_getconn_type(sess, AIM_CONN_TYPE_BOS));
-    }
+gboolean owl_aim_send_nop(gpointer data) {
+  owl_global *g = data;
+  if (owl_global_is_doaimevents(g)) {
+    aim_session_t *sess = owl_global_get_aimsess(g);
+    aim_flap_nop(sess, aim_getconn_type(sess, AIM_CONN_TYPE_BOS));
+  }
+  return TRUE;
 }
 
@@ -183 +185 @@
   owl_function_debugmsg("owl_aim_login: connecting");
 
-  g.aim_nop_timer = owl_select_add_timer("owl_aim_send_nop", 30, 30, owl_aim_send_nop, NULL, NULL);
+  g.aim_nop_timer = g_timeout_add_seconds(30, owl_aim_send_nop, &g);
 
   return(0);
 }
 
-static void owl_aim_unset_ignorelogin(owl_timer *t, void *data)
-{
-    owl_global_unset_ignore_aimlogin(&g);
+static gboolean owl_aim_unset_ignorelogin(void *data)
+{
+  owl_global *g = data;
+  owl_global_unset_ignore_aimlogin(g);
+  return FALSE;  /* only run once. */
 }
 
@@ -209 +213 @@
   /* start the ingorelogin timer */
   owl_global_set_ignore_aimlogin(&g);
-  owl_select_add_timer("owl_aim_unset_ignorelogin",
-                       owl_global_get_aim_ignorelogin_timer(&g),
-                       0, owl_aim_unset_ignorelogin, NULL, NULL);
+  g_timeout_add_seconds(owl_global_get_aim_ignorelogin_timer(&g),
+                        owl_aim_unset_ignorelogin, &g);
 
   /* aim_ssi_setpresence(owl_global_get_aimsess(&g), 0x00000400); */
@@ -225 +228 @@
   owl_global_set_aimnologgedin(&g);
   owl_global_set_no_doaimevents(&g);
-  owl_select_remove_timer(g.aim_nop_timer);
+  if (g.aim_nop_timer) {
+    g_source_remove(g.aim_nop_timer);
+    g.aim_nop_timer = 0;
+  }
 }
 
@@ -244 +250 @@
   owl_global_set_aimnologgedin(&g);
   owl_global_set_no_doaimevents(&g);
-  owl_select_remove_timer(g.aim_nop_timer);
+  if (g.aim_nop_timer) {
+    g_source_remove(g.aim_nop_timer);
+    g.aim_nop_timer = 0;
+  }
 }
 

owl.h

@@ -627 +627 @@
   owl_list io_dispatch_list;
   GList *timerlist;
-  owl_timer *aim_nop_timer;
+  guint aim_nop_timer;
   int load_initial_subs;
   FILE *debug_file;