Changeset 87833a8

Timestamp:

Mar 25, 2011, 3:46:46 AM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Children:

37d188f

Parents:

96ade35

git-author:

David Benjamin <davidben@mit.edu> (02/26/11 14:11:26)

git-committer:

David Benjamin <davidben@mit.edu> (03/25/11 03:46:46)

Message:

Make owl_signal_init take a signal-thread callback

Instead of pushing the work directly the main thread. This will allow us
to react to SIGINT earlier.

Files:

• owl.c (modified) (3 diffs)
• signal.c (modified) (4 diffs)

owl.c

@@ -354 +354 @@
 }
 
-static void sig_handler(int sig, void *data) {
+static gboolean sig_handler_main_thread(gpointer data) {
+  int sig = GPOINTER_TO_INT(data);
+
   owl_function_debugmsg("Got signal %d", sig);
   /* TODO: These don't need to be re-entrant anymore! */
@@ -372 +374 @@
     owl_process_input_char(in);
   }
+  return FALSE;
+}
+
+static void sig_handler(int sig, void *data) {
+  GMainContext *context = data;
+  GSource *source;
+
+  /* TODO: Special-case SIGINT so that it can interrupt outside the
+   * event loop. */
+
+  /* Send a message to the main thread. */
+  source = g_idle_source_new();
+  g_source_set_priority(source, G_PRIORITY_DEFAULT);
+  g_source_set_callback(source, sig_handler_main_thread,
+                        GINT_TO_POINTER(sig), NULL);
+  g_source_attach(source, context);
+  g_source_unref(source);
 }
 
@@ -385 +404 @@
   sigaddset(&sigset, SIGINT);
 
-  owl_signal_init(&sigset, sig_handler, NULL);
+  owl_signal_init(&sigset, sig_handler, g_main_context_default());
 }
 

signal.c

@@ -12 +12 @@
 
 static gpointer signal_thread_func(gpointer data);
-static gboolean signal_thunk(gpointer data);
 
+/* Initializes the signal thread to listen for 'set' on a dedicated
+ * thread. 'callback' is called *on the signal thread* when a signal
+ * is received.
+ *
+ * This function /must/ be called before any other threads are
+ * created. (Otherwise the signals will not get blocked correctly.) */
 void owl_signal_init(const sigset_t *set, void (*callback)(int, void*), void *data) {
   GError *error = NULL;
@@ -23 +28 @@
   pthread_sigmask(SIG_BLOCK, set, NULL);
   /* Spawn a dedicated thread to sigwait. */
-  signal_thread = g_thread_create(signal_thread_func, g_main_context_default(),
-                                  FALSE, &error);
+  signal_thread = g_thread_create(signal_thread_func, NULL, FALSE, &error);
   if (signal_thread == NULL) {
     fprintf(stderr, "Failed to create signal thread: %s\n", error->message);
@@ -32 +36 @@
 
 static gpointer signal_thread_func(gpointer data) {
-  GMainContext *context = data;
-
   while (1) {
-    GSource *source;
-    int signal;
+     int signal;
     int ret;
 
@@ -44 +45 @@
       continue;
 
-    /* Send a message to the other main. */
-    source = g_idle_source_new();
-    g_source_set_priority(source, G_PRIORITY_DEFAULT);
-    g_source_set_callback(source, signal_thunk, GINT_TO_POINTER(signal), NULL);
-    g_source_attach(source, context);
-    g_source_unref(source);
+    signal_cb(signal, signal_cbdata);
   }
   return NULL;
 }
-
-static gboolean signal_thunk(gpointer data) {
-  signal_cb(GPOINTER_TO_INT(data), signal_cbdata);
-  return FALSE;
-}