svn commit: r263730 - stable/10/usr.sbin/ctld

[Edward Tomasz Napierala]

Author: trasz
Date: Tue Mar 25 12:24:18 2014
New Revision: 263730
URL: http://svnweb.freebsd.org/changeset/base/263730

Log:
  MFC r261764:
  
  So, it turns out SIGCHLD is discarded by default, so we have to set up
  a dummy handler to make it interrupt an ioctl(2) or select(2).
  
  This makes those short-lived ctld(8) zombies disappear.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/usr.sbin/ctld/ctld.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/ctld/ctld.c
==============================================================================
--- stable/10/usr.sbin/ctld/ctld.c	Tue Mar 25 12:22:30 2014	(r263729)
+++ stable/10/usr.sbin/ctld/ctld.c	Tue Mar 25 12:24:18 2014	(r263730)
@@ -1742,6 +1742,17 @@ sigterm_handler(int dummy __unused)
 }
 
 static void
+sigchld_handler(int dummy __unused)
+{
+
+	/*
+	 * The only purpose of this handler is to make SIGCHLD
+	 * interrupt the ISCSIDWAIT ioctl(2), so we can call
+	 * wait_for_children().
+	 */
+}
+
+static void
 register_signals(void)
 {
 	struct sigaction sa;
@@ -1763,6 +1774,11 @@ register_signals(void)
 	error = sigaction(SIGINT, &sa, NULL);
 	if (error != 0)
 		log_err(1, "sigaction");
+
+	sa.sa_handler = sigchld_handler;
+	error = sigaction(SIGCHLD, &sa, NULL);
+	if (error != 0)
+		log_err(1, "sigaction");
 }
 
 int