From owner-svn-src-all@FreeBSD.ORG  Tue Feb 11 11:33:44 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A1C921EC;
 Tue, 11 Feb 2014 11:33:44 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8B5ED174B;
 Tue, 11 Feb 2014 11:33:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1BBXiMw058929;
 Tue, 11 Feb 2014 11:33:44 GMT (envelope-from trasz@svn.freebsd.org)
Received: (from trasz@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1BBXi2J058928;
 Tue, 11 Feb 2014 11:33:44 GMT (envelope-from trasz@svn.freebsd.org)
Message-Id: <201402111133.s1BBXi2J058928@svn.freebsd.org>
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Tue, 11 Feb 2014 11:33:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r261764 - head/usr.sbin/ctld
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Feb 2014 11:33:44 -0000

Author: trasz
Date: Tue Feb 11 11:33:44 2014
New Revision: 261764
URL: http://svnweb.freebsd.org/changeset/base/261764

Log:
  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:
  head/usr.sbin/ctld/ctld.c

Modified: head/usr.sbin/ctld/ctld.c
==============================================================================
--- head/usr.sbin/ctld/ctld.c	Tue Feb 11 11:32:36 2014	(r261763)
+++ head/usr.sbin/ctld/ctld.c	Tue Feb 11 11:33:44 2014	(r261764)
@@ -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