Changeset 08e9842

Timestamp:

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

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

dc1edbd

Parents:

6bd485e

git-author:

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

git-committer:

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

Message:

Cleanly destroy the signal thread on shutdown

This isn't strictly necessary here, but we should probably be in the
habit of safely cleaning up our helper threads.

Switch the implementation from GThread to pthreads directly. The
cleanest way to kill a signaling thread is to send it SIGTERM with
pthread_kill, but GThread doesn't expose that and gives no way to get at
the pthread_t.

Files:

• owl.c (modified) (1 diff)
• signal.c (modified) (6 diffs)

owl.c

@@ -620 +620 @@
   /* Shut down everything. */
   owl_zephyr_shutdown();
+  owl_signal_shutdown();
   owl_shutdown_curses();
   return 0;

signal.c

@@ -1 @@
-#include <glib.h>
 #include <errno.h>
 #include <pthread.h>
@@ -6 +5 @@
 #include <stdlib.h>
 
-static GThread *signal_thread;
+static pthread_t signal_thread;
 static sigset_t signal_set;
 
@@ -12 +11 @@
 static void *signal_cbdata;
 
-static gpointer signal_thread_func(gpointer data);
+static void *signal_thread_func(void *data);
 
 /* Initializes the signal thread to listen for 'set' on a dedicated
@@ -21 +20 @@
  * 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;
   int ret;
 
@@ -33 +31 @@
   }
   /* Spawn a dedicated thread to sigwait. */
-  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);
+  if ((ret = pthread_create(&signal_thread, NULL,
+                            signal_thread_func, NULL)) != 0) {
+    errno = ret;
+    perror("pthread_create");
     exit(1);
   }
 }
 
-static gpointer signal_thread_func(gpointer data) {
+static void *signal_thread_func(void *data) {
   while (1) {
      int signal;
@@ -51 +50 @@
 
     signal_cb(signal, signal_cbdata);
+    /* Die on SIGTERM. */
+    if (signal == SIGTERM)
+      break;
   }
   return NULL;
 }
+
+void owl_signal_shutdown(void) {
+  pthread_kill(signal_thread, SIGTERM);
+  pthread_join(signal_thread, NULL);
+}