Changeset 1d21d9f for signal.c

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:

736835d

Parents:

ba12b44

git-author:

David Benjamin <davidben@mit.edu> (03/03/11 09:50:32)

git-committer:

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

Message:

Use sigwaitinfo instead of sigwait

Eh, may as well give the signal handlers a little bit more rope.

File:

• signal.c (modified) (3 diffs)

signal.c

@@ -8 +8 @@
 static sigset_t signal_set;
 
-static void (*signal_cb)(int, void*);
+static void (*signal_cb)(const siginfo_t*, void*);
 static void *signal_cbdata;
 
@@ -19 +19 @@
  * 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) {
+void owl_signal_init(const sigset_t *set, void (*callback)(const siginfo_t*, void*), void *data) {
   int ret;
 
@@ -41 +41 @@
 static void *signal_thread_func(void *data) {
   while (1) {
-     int signal;
+    siginfo_t siginfo;
     int ret;
 
-    ret = sigwait(&signal_set, &signal);
-    /* TODO: Print an error? man page claims it never errors. */
-    if (ret != 0)
+    ret = sigwaitinfo(&signal_set, &siginfo);
+    /* TODO: Print an error? */
+    if (ret < 0)
       continue;
 
-    signal_cb(signal, signal_cbdata);
+    signal_cb(&siginfo, signal_cbdata);
     /* Die on SIGTERM. */
-    if (signal == SIGTERM)
+    if (siginfo.si_signo == SIGTERM)
       break;
   }