Changeset fafb842 for owl.c

Timestamp:

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

Author:

David Benjamin <davidben@mit.edu>

Children:

96ade35

Parents:

cd28517

git-author:

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

git-committer:

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

Message:

First go at sigwait-based signal handling

SIGINT doesn't quite work.

File:

• owl.c (modified) (4 diffs)

owl.c

@@ -354 +354 @@
 }
 
-void sig_handler(int sig, siginfo_t *si, void *data)
-{
-  if (sig==SIGWINCH) {
+static void sig_handler(int sig, void *data) {
+  owl_function_debugmsg("Got signal %d", sig);
+  /* TODO: These don't need to be re-entrant anymore! */
+  if (sig == SIGWINCH) {
     /* we can't inturrupt a malloc here, so it just sets a flag
      * schedulding a resize for later
      */
     owl_function_resize();
-  } else if (sig==SIGPIPE || sig==SIGCHLD) {
-    /* Set a flag and some info that we got the sigpipe
-     * so we can record that we got it and why... */
-    owl_global_set_errsignal(&g, sig, si);
-  } else if (sig==SIGTERM || sig==SIGHUP) {
+  } else if (sig == SIGPIPE || sig == SIGCHLD) {
+    owl_function_error("Got unexpected signal: %d %s",
+                       sig, (sig == SIGPIPE) ? "SIGPIPE" : "SIGCHLD");
+  } else if (sig == SIGTERM || sig == SIGHUP) {
     owl_function_quit();
-  }
-}
-
-void sigint_handler(int sig, siginfo_t *si, void *data)
-{
-  owl_global_set_interrupted(&g);
-}
-
-static int owl_errsignal_pre_select_action(owl_ps_action *a, void *data)
-{
-  siginfo_t si;
-  int signum;
-  if ((signum = owl_global_get_errsignal_and_clear(&g, &si)) > 0) {
-    owl_function_error("Got unexpected signal: %d %s  (code: %d band: %ld  errno: %d)",
-        signum, signum==SIGPIPE?"SIGPIPE":"SIG????",
-        si.si_code, si.si_band, si.si_errno);
-  }
-  return 0;
+  } else if (sig == SIGINT) {
+    owl_input in;
+    in.ch = in.uch = owl_global_get_startup_tio(&g)->c_cc[VINTR];
+    owl_process_input_char(in);
+  }
 }
 
 void owl_register_signal_handlers(void) {
-  struct sigaction sigact;
-
-  /* signal handler */
-  /*sigact.sa_handler=sig_handler;*/
-  sigact.sa_sigaction=sig_handler;
-  sigemptyset(&sigact.sa_mask);
-  sigact.sa_flags=SA_SIGINFO;
-  sigaction(SIGWINCH, &sigact, NULL);
-  sigaction(SIGALRM, &sigact, NULL);
-  sigaction(SIGPIPE, &sigact, NULL);
-  sigaction(SIGTERM, &sigact, NULL);
-  sigaction(SIGHUP, &sigact, NULL);
-
-  sigact.sa_sigaction=sigint_handler;
-  sigaction(SIGINT, &sigact, NULL);
+  sigset_t sigset;
+
+  sigemptyset(&sigset);
+  sigaddset(&sigset, SIGWINCH);
+  sigaddset(&sigset, SIGALRM);
+  sigaddset(&sigset, SIGPIPE);
+  sigaddset(&sigset, SIGTERM);
+  sigaddset(&sigset, SIGHUP);
+  sigaddset(&sigset, SIGINT);
+
+  owl_signal_init(&sigset, sig_handler, NULL);
 }
 
@@ -479 +462 @@
   g.load_initial_subs = opts.load_initial_subs;
 
-  owl_register_signal_handlers();
   owl_start_curses();
 
@@ -491 +473 @@
   g_strfreev(argv_copy);
   owl_global_set_haveaim(&g);
+
+  owl_register_signal_handlers();
 
   /* register STDIN dispatch; throw away return, we won't need it */
@@ -591 +575 @@
   g_source_unref(source);
 
-  owl_select_add_pre_select_action(owl_errsignal_pre_select_action, NULL, NULL);
-
   owl_function_debugmsg("startup: entering main loop");
   owl_select_run_loop();