From owner-svn-src-user@FreeBSD.ORG  Tue Jul 16 11:54:45 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 57B49665;
 Tue, 16 Jul 2013 11:54:45 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 4B410D6;
 Tue, 16 Jul 2013 11:54:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6GBsjjI025527;
 Tue, 16 Jul 2013 11:54:45 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6GBsj7w025526;
 Tue, 16 Jul 2013 11:54:45 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <201307161154.r6GBsj7w025526@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Tue, 16 Jul 2013 11:54:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r253390 - user/pho/stress2/lib
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Jul 2013 11:54:45 -0000

Author: pho
Date: Tue Jul 16 11:54:44 2013
New Revision: 253390
URL: http://svnweb.freebsd.org/changeset/base/253390

Log:
  Check if test scenario terminate before time.
  
  Sponsored by:	EMC / Isilon storage division

Modified:
  user/pho/stress2/lib/main.c

Modified: user/pho/stress2/lib/main.c
==============================================================================
--- user/pho/stress2/lib/main.c	Tue Jul 16 11:54:25 2013	(r253389)
+++ user/pho/stress2/lib/main.c	Tue Jul 16 11:54:44 2013	(r253390)
@@ -165,8 +165,11 @@ run_test(void)
 	if (p < 0)
 		err(1, "fork() in %s:%d", __FILE__, __LINE__);
 	while (done_testing != 1 &&
-			(time(NULL) - start) < op->run_time)
+			(time(NULL) - start) < op->run_time) {
 		sleep(1);
+		if (waitpid(p, &status, WNOHANG) == p)
+			return (status);
+	}
 	if (kill(p, SIGHUP) == -1)
 		warn("kill(%d, SIGHUP), %s:%d", p, __FILE__, __LINE__);