Changeset b7bb454 for owl.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:

• owl.c (modified) (4 diffs)

owl.c

@@ -394 +394 @@
   nexttime=time(NULL);
 
+
+  owl_select_add_timer(180, 180, owl_zephyr_buddycheck_timer, NULL);
+
+  /* If we ever deprecate the mainloop hook, remove this. */
+  owl_select_add_timer(0, 1, owl_perlconfig_mainloop, NULL);
+
+
 #ifdef HAVE_LIBZEPHYR
   /* Check for any zephyrs that have come in while we've done init. */
@@ -413 +420 @@
 
     followlast=owl_global_should_followlast(&g);
-    
-    owl_perlconfig_mainloop();
 
     /* little hack */
@@ -439 +444 @@
       if(owl_process_message(m))
         newmsgs = 1;
-    }
-
-    /* is it time to check zbuddies? */
-    if (owl_global_is_pseudologins(&g)) {
-      if (owl_timer_is_expired(owl_global_get_zephyr_buddycheck_timer(&g))) {
-        owl_function_debugmsg("Doing zephyr buddy check");
-        owl_function_zephyr_buddy_check(1);
-        owl_timer_reset(owl_global_get_zephyr_buddycheck_timer(&g));
-      }
     }
 
@@ -780 +776 @@
 
 #endif /* OWL_STDERR_REDIR */
+
+void owl_zephyr_buddycheck_timer(owl_timer *t, void *data)
+{
+    owl_function_debugmsg("Doing zephyr buddy check");
+    owl_function_zephyr_buddy_check(1);
+}