Changeset ba12b44

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:

1d21d9f

Parents:

117b2ba

git-author:

David Benjamin <davidben@mit.edu> (03/02/11 13:47:21)

git-committer:

David Benjamin <davidben@mit.edu> (05/23/11 20:57:46)

Message:

Add owl_select_post_task helper function

Honestly, the only thing you'd ever want to do to a message loop from
another thread is post a one-off task to it. Why Glib makes this so
difficult is beyond me.

Files:

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

owl.c

@@ -365 +365 @@
 }
 
-static gboolean sig_handler_main_thread(gpointer data) {
+static void sig_handler_main_thread(void *data) {
   int sig = GPOINTER_TO_INT(data);
 
@@ -378 +378 @@
     owl_process_input_char(in);
   }
-  return FALSE;
 }
 
 static void sig_handler(int sig, void *data) {
-  GMainContext *context = data;
-  GSource *source;
-
   /* If it was an interrupt, set a flag so we can handle it earlier if
    * needbe. sig_handler_main_thread will check the flag to make sure
@@ -392 +388 @@
   }
   /* 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);
+  owl_select_post_task(sig_handler_main_thread, GINT_TO_POINTER(sig), NULL);
 }
 
@@ -436 +427 @@
   CHECK_RESULT("sigaddset", sigaddset(&sigset, SIGHUP));
   CHECK_RESULT("sigaddset", sigaddset(&sigset, SIGINT));
-  owl_signal_init(&sigset, sig_handler, g_main_context_default());
+  owl_signal_init(&sigset, sig_handler, NULL);
 }
 

select.c

@@ -2 +2 @@
 
 static GMainLoop *loop = NULL;
+static GMainContext *context;
 static int dispatch_active = 0;
 
@@ -307 +308 @@
 void owl_select_run_loop(void)
 {
-  loop = g_main_loop_new(NULL, FALSE);
+  context = g_main_context_default();
+  loop = g_main_loop_new(context, FALSE);
   g_main_loop_run(loop);
 }
@@ -318 +320 @@
   }
 }
+
+typedef struct _owl_task { /*noproto*/
+  void (*cb)(void *);
+  void *cbdata;
+  void (*destroy_cbdata)(void *);
+} owl_task;
+
+static gboolean _run_task(gpointer data)
+{
+  owl_task *t = data;
+  if (t->cb)
+    t->cb(t->cbdata);
+  return FALSE;
+}
+
+static void _destroy_task(void *data)
+{
+  owl_task *t = data;
+  if (t->destroy_cbdata)
+    t->destroy_cbdata(t->cbdata);
+  g_free(t);
+}
+
+void owl_select_post_task(void (*cb)(void*), void *cbdata, void (*destroy_cbdata)(void*))
+{
+  GSource *source = g_idle_source_new();
+  owl_task *t = g_new0(owl_task, 1);
+  t->cb = cb;
+  t->cbdata = cbdata;
+  t->destroy_cbdata = destroy_cbdata;
+  g_source_set_priority(source, G_PRIORITY_DEFAULT);
+  g_source_set_callback(source, _run_task, t, _destroy_task);
+  g_source_attach(source, context);
+  g_source_unref(source);
+}