Changeset 64b6449

Timestamp:

Mar 29, 2009, 7:02:30 PM (15 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

owl

Children:

6fdef66

Parents:

228326a

Message:

try owl_zephyr_process_events() at the end of owl_zephyr_handle_ack()
   to address race condition.  Also one after the select in the main
   loop for good measure.

Files:

• owl.c (modified) (1 diff)
• owl.h (modified) (1 diff)
• zephyr.c (modified) (1 diff)

owl.c

@@ -617 +617 @@
     }
 
+    /* select on FDs we know about. */
+
     /* Some calls into libzephyr call Z_WaitForNotice(), which has its
      * own select loop and may leave zephyrs on the queue. Check for
      * them now, and process any we find. */
     owl_zephyr_process_events(NULL);
-
-    /* select on FDs we know about. */
     owl_select();
-
+    owl_zephyr_process_events(NULL);
+    
     /* Log any error signals */
     {

owl.h

@@ -47 +47 @@
 
 #define OWL_VERSION         2.2.0
-#define OWL_VERSION_STRING "2.2.0-pre1"
+#define OWL_VERSION_STRING "2.2.0-pre2"
 
 /* Feature that is being tested to redirect stderr through a pipe. 

zephyr.c

@@ -527 +527 @@
     owl_function_error("Internal error on ack (%s)", retnotice->z_message);
   }
+  owl_zephyr_process_events(NULL);
 }
 #else