Changeset 12e291a330f117a61b8b222315c1f39822010a2a

Timestamp:

10/19/09 22:16:54 (5 weeks ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

git-author:

Alejandro R. Sedeño <asedeno@mit.edu> / 2009-10-13T03:14:02Z-0400

Parents:

dbf94e9d63a677506783cbdb11f0d965aa5f1d70

Children:

0697f097cd4d945d2e96f60d1690da9c5f4d9dc4

git-committer:

Alejandro R. Sedeño <asedeno@mit.edu> / 2009-10-19T22:16:54Z-0400

Message:

Add a zephyr pre-select action.

This replaces the solution commited in
5657d536d09861fe734329e12194b4c410d34d20.

Files:

• zephyr.c (modified) (3 diffs)

zephyr.c

@@ -135 +135 @@
   }
 
- perl = owl_perlconfig_execute("BarnOwl::Zephyr::_zephyr_startup()");
- owl_free(perl);
+  perl = owl_perlconfig_execute("BarnOwl::Zephyr::_zephyr_startup()");
+  owl_free(perl);
+
+  owl_select_add_pre_select_action(owl_zephyr_pre_select_action, NULL, NULL);
 }
 
@@ -1305 +1307 @@
 }
 
-#ifdef HAVE_LIBZEPHYR
-void owl_zephyr_process_events(owl_dispatch *d) {
+/*
+ * Process zephyrgrams from libzephyr's queue. To prevent starvation,
+ * process a maximum of OWL_MAX_ZEPHYRGRAMS_TO_PROCESS.
+ *
+ * Returns the number of zephyrgrams processed.
+ */
+
+#define OWL_MAX_ZEPHYRGRAMS_TO_PROCESS 20
+
+int _owl_zephyr_process_events(void) /* noproto */
+{
   int zpendcount=0;
+#ifdef HAVE_LIBZEPHYR
   ZNotice_t notice;
   owl_message *m=NULL;
 
-  while(owl_zephyr_zpending() && zpendcount < 20) {
+  while(owl_zephyr_zpending() && zpendcount < OWL_MAX_ZEPHYRGRAMS_TO_PROCESS) {
     if (owl_zephyr_zpending()) {
       ZReceiveNotice(&notice, NULL);
@@ -1334 +1346 @@
     }
   }
-}
-
-#else
-void owl_zephyr_process_events(owl_dispatch *d) {
-  
-}
-#endif
+#endif
+  return zpendcount;
+}
+
+void owl_zephyr_process_events(owl_dispatch *d)
+{
+  _owl_zephyr_process_events();
+}
+
+int owl_zephyr_pre_select_action(owl_ps_action *a, void *p)
+{
+  return _owl_zephyr_process_events();
+}