From owner-svn-src-projects@FreeBSD.ORG  Mon Oct 14 23:15:59 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@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 ESMTP id 37936B58;
 Mon, 14 Oct 2013 23:15:59 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
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 25B452EF1;
 Mon, 14 Oct 2013 23:15:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9ENFx4W025342;
 Mon, 14 Oct 2013 23:15:59 GMT (envelope-from asomers@svn.freebsd.org)
Received: (from asomers@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9ENFwXn025341;
 Mon, 14 Oct 2013 23:15:59 GMT (envelope-from asomers@svn.freebsd.org)
Message-Id: <201310142315.r9ENFwXn025341@svn.freebsd.org>
From: Alan Somers <asomers@FreeBSD.org>
Date: Mon, 14 Oct 2013 23:15:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r256473 - projects/zfsd/head/cddl/sbin/zfsd
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Oct 2013 23:15:59 -0000

Author: asomers
Date: Mon Oct 14 23:15:58 2013
New Revision: 256473
URL: http://svnweb.freebsd.org/changeset/base/256473

Log:
  Modify Zfsd to honor shutdown signals even when started during a devctl
  event flood.
  
  	cddl/sbin/zfsd/zfsd.cc:
  		In ZfsDaemon::Run(), catch DevCtl::Exceptions instead of one
  		of its derived classes ZfsdExceptions.  libdevctl, which
  		contains some of the methods we call in this context, only
  		emits DevCtl::Exceptions, and we must catch these too.
  
  		In ZfsDaemon::DetectMissedEvents(), monitor
  		s_terminateEventLoop so we are guaranteed to exit our loop
  		if a shutdown is requested.
  
  Submitted by:	gibbs
  Approved by:	ken (mentor)
  Sponsored by:	Spectra Logic Corporation

Modified:
  projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc

Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc
==============================================================================
--- projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc	Mon Oct 14 23:13:03 2013	(r256472)
+++ projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc	Mon Oct 14 23:15:58 2013	(r256473)
@@ -145,7 +145,7 @@ ZfsDaemon::Run()
 
 			daemon.EventLoop();
 
-		} catch (const ZfsdException &exp) {
+		} catch (const DevCtl::Exception &exp) {
 			exp.Log();
 		}
 	}
@@ -287,7 +287,7 @@ ZfsDaemon::DetectMissedEvents()
 		 * If the system state has changed durring our
 		 * interrogation, start over.
 		 */
-	} while (EventsPending());
+	} while (s_terminateEventLoop == false && EventsPending());
 
 	RescanSystem();
 }