Changeset 3687413

Timestamp:

May 16, 2010, 1:15:23 AM (15 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

f034ac0

Parents:

7ba9e0de

git-author:

David Benjamin <davidben@mit.edu> (05/14/10 18:12:21)

git-committer:

David Benjamin <davidben@mit.edu> (05/16/10 01:15:23)

Message:

Only enable pseudologin timer when we use it

The feature defaults to off, and I imagine most people don't actually
use it. In that case, we shouldn't bother waking up every 2 minutes to
support it.

(owl_zephyr_buddycheck_timer was moved to zephyr.c so it'd get a
prototype. Also, it's zephyr-specific.)

Signed-off-by: David Benjamin <davidben@mit.edu>

Files:

• owl.c (modified) (2 diffs)
• variable.c (modified) (1 diff)
• zephyr.c (modified) (1 diff)

owl.c

@@ -455 +455 @@
 #endif /* OWL_STDERR_REDIR */
 
-void owl_zephyr_buddycheck_timer(owl_timer *t, void *data)
-{
-  if (owl_global_is_pseudologins(&g)) {
-    owl_function_debugmsg("Doing zephyr buddy check");
-    owl_function_zephyr_buddy_check(1);
-  }
-}
-
 static int owl_refresh_pre_select_action(owl_ps_action *a, void *data)
 {
@@ -627 +619 @@
   owl_global_push_context(&g, OWL_CTX_READCONFIG|OWL_CTX_RECV, NULL, "recv");
 
-  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, NULL);

variable.c

@@ -428 +428 @@
 int owl_variable_pseudologins_set(owl_variable *v, const void *newval)
 {
+  static owl_timer *timer = NULL;
   if (newval) {
     if (*(const int*)newval == 1) {
       owl_function_zephyr_buddy_check(0);
+      if (timer == NULL) {
+        timer = owl_select_add_timer(180, 180, owl_zephyr_buddycheck_timer, NULL, NULL);
+      }
+    } else {
+      if (timer != NULL) {
+        owl_select_remove_timer(timer);
+        timer = NULL;
+      }
     }
   }

zephyr.c

@@ -1364 +1364 @@
 #endif
 
+void owl_zephyr_buddycheck_timer(owl_timer *t, void *data)
+{
+  if (owl_global_is_pseudologins(&g)) {
+    owl_function_debugmsg("Doing zephyr buddy check");
+    owl_function_zephyr_buddy_check(1);
+  } else {
+    owl_function_debugmsg("Warning: owl_zephyr_buddycheck_timer call pointless; timer should have been disabled");
+  }
+}
+
 /*
  * Process zephyrgrams from libzephyr's queue. To prevent starvation,