Changeset e2cc848

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:

1491439

Parents:

81db142

git-author:

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

git-committer:

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

Message:

Just ignore SIGPIPE altogether

There's not much point in switching back and forth from ignoring it and
mostly ignoring it. Also, we don't handle SIGCHLD so remove the code for
it.

(We actually also disable it in the Jabber module because XML::Stream
sets $SIG{PIPE}. Meh.)

Files:

• filterproc.c (modified) (3 diffs)
• owl.c (modified) (2 diffs)

filterproc.c

@@ -17 +17 @@
   int err = 0;
   struct pollfd fds[2];
-  struct sigaction sig = {.sa_handler = SIG_IGN}, old;
 
   fcntl(rfd, F_SETFL, O_NONBLOCK | fcntl(rfd, F_GETFL));
@@ -27 +26 @@
   fds[1].events = POLLOUT;
 
-  sigaction(SIGPIPE, &sig, &old);
-  
   while(1) {
     if(out && *out) {
@@ -67 +64 @@
 
   *in = g_string_free(str, err < 0);
-  sigaction(SIGPIPE, &old, NULL);
   return err;
 }

owl.c

@@ -358 +358 @@
 
   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) {
-    owl_function_error("Got unexpected signal: %d %s",
-                       sig, (sig == SIGPIPE) ? "SIGPIPE" : "SIGCHLD");
   } else if (sig == SIGTERM || sig == SIGHUP) {
     owl_function_quit();
@@ -394 +387 @@
 
 void owl_register_signal_handlers(void) {
+  struct sigaction ignore = { .sa_handler = SIG_IGN };
   sigset_t sigset;
 
+  /* Turn off SIGPIPE; we check the return value of write. */
+  sigaction(SIGPIPE, &ignore, NULL);
+
+  /* Register some signals with the signal thread. */
   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, g_main_context_default());
 }