Changeset 8402a093

Timestamp:

Sep 18, 2010, 3:14:30 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

3ecd78b

Parents:

10dd8e6

git-author:

David Benjamin <davidben@mit.edu> (09/14/10 16:40:42)

git-committer:

David Benjamin <davidben@mit.edu> (09/18/10 15:14:30)

Message:

Move the error signal logging to a pre_select_action

This reduces our event loop to owl_select.

File:

• owl.c (modified) (3 diffs)

owl.c

@@ -356 +356 @@
 }
 
+static int owl_errsignal_pre_select_action(owl_ps_action *a, void *data)
+{
+  siginfo_t si;
+  int signum;
+  if ((signum = owl_global_get_errsignal_and_clear(&g, &si)) > 0) {
+    owl_function_error("Got unexpected signal: %d %s  (code: %d band: %ld  errno: %d)",
+        signum, signum==SIGPIPE?"SIGPIPE":"SIG????",
+        si.si_code, si.si_band, si.si_errno);
+  }
+  return 0;
+}
+
 void owl_register_signal_handlers(void) {
   struct sigaction sigact;
@@ -569 +581 @@
   owl_select_add_pre_select_action(owl_refresh_pre_select_action, NULL, NULL);
   owl_select_add_pre_select_action(owl_process_messages, NULL, NULL);
+  owl_select_add_pre_select_action(owl_errsignal_pre_select_action, NULL, NULL);
 
   owl_function_debugmsg("startup: entering main loop");
@@ -575 +588 @@
     /* select on FDs we know about. */
     owl_select();
-
-    /* Log any error signals */
-    {
-      siginfo_t si;
-      int signum;
-      if ((signum = owl_global_get_errsignal_and_clear(&g, &si)) > 0) {
-        owl_function_error("Got unexpected signal: %d %s  (code: %d band: %ld  errno: %d)",
-                           signum, signum==SIGPIPE?"SIGPIPE":"SIG????",
-                           si.si_code, si.si_band, si.si_errno);
-      }
-    }
-
-  }
-}
+  }
+}