Changeset 81db142 for owl.c

Timestamp:

May 23, 2011, 8:57:46 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

e2cc848

Parents:

257b9c4

git-author:

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

git-committer:

David Benjamin <davidben@mit.edu> (05/23/11 20:57: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.

File:

• owl.c (modified) (3 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());
 }