svn commit: r262846 - stable/10/usr.sbin/iscsid

[Edward Tomasz Napierala]

Author: trasz
Date: Thu Mar  6 11:15:54 2014
New Revision: 262846
URL: http://svnweb.freebsd.org/changeset/base/262846

Log:
  MFC r261748:
  
  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 iscsid(8) zombies disappear.
  
  Sponsored by:	The FreeBSD Foundation

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

Modified: stable/10/usr.sbin/iscsid/iscsid.c
==============================================================================
--- stable/10/usr.sbin/iscsid/iscsid.c	Thu Mar  6 11:14:36 2014	(r262845)
+++ stable/10/usr.sbin/iscsid/iscsid.c	Thu Mar  6 11:15:54 2014	(r262846)
@@ -394,6 +394,32 @@ set_timeout(int timeout)
 }
 
 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_sigchld(void)
+{
+	struct sigaction sa;
+	int error;
+
+	bzero(&sa, sizeof(sa));
+	sa.sa_handler = sigchld_handler;
+	sigfillset(&sa.sa_mask);
+	error = sigaction(SIGCHLD, &sa, NULL);
+	if (error != 0)
+		log_err(1, "sigaction");
+
+}
+
+static void
 handle_request(int iscsi_fd, const struct iscsi_daemon_request *request, int timeout)
 {
 	struct connection *conn;
@@ -522,6 +548,8 @@ main(int argc, char **argv)
 
 	pidfile_write(pidfh);
 
+	register_sigchld();
+
 	for (;;) {
 		log_debugx("waiting for request from the kernel");