From owner-svn-src-user@freebsd.org  Mon Mar 20 08:58:23 2017
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A899DD0C33B
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Mon, 20 Mar 2017 08:58:23 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 761051305;
 Mon, 20 Mar 2017 08:58:23 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2K8wMx3021362;
 Mon, 20 Mar 2017 08:58:22 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2K8wM0w021361;
 Mon, 20 Mar 2017 08:58:22 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201703200858.v2K8wM0w021361@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org
 using -f
From: Peter Holm <pho@FreeBSD.org>
Date: Mon, 20 Mar 2017 08:58:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r315628 - user/pho/stress2/testcases/tcp
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.23
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Mar 2017 08:58:23 -0000

Author: pho
Date: Mon Mar 20 08:58:22 2017
New Revision: 315628
URL: https://svnweb.freebsd.org/changeset/base/315628

Log:
  Added missing waitpid() and cleanup code while here.
  
  Sponsored by:	Dell EMC Isilon

Modified:
  user/pho/stress2/testcases/tcp/tcp.c

Modified: user/pho/stress2/testcases/tcp/tcp.c
==============================================================================
--- user/pho/stress2/testcases/tcp/tcp.c	Mon Mar 20 08:57:25 2017	(r315627)
+++ user/pho/stress2/testcases/tcp/tcp.c	Mon Mar 20 08:58:22 2017	(r315628)
@@ -30,7 +30,10 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/socket.h>
+#include <sys/wait.h>
+
 #include <netinet/in.h>
+
 #include <err.h>
 #include <errno.h>
 #include <netdb.h>
@@ -143,8 +146,10 @@ writer(void) {
 			if (write(tcpsock, buf, bufsize) < 0) {
 				if (errno == EPIPE)
 					return;
-				err(1, "write(%d), %s:%d", tcpsock,
+				if (errno != ECONNRESET)
+					err(1, "write(%d), %s:%d", tcpsock,
 						__FILE__, __LINE__);
+				_exit(EXIT_SUCCESS);
 			}
 		}
 	}
@@ -171,11 +176,13 @@ test(void)
 
 	if ((pid = fork()) == 0) {
 		writer();
-		exit(EXIT_SUCCESS);
+		_exit(EXIT_SUCCESS);
 
 	} else if (pid > 0) {
 		reader();
 		kill(pid, SIGINT);
+		if (waitpid(pid, NULL, 0) != pid)
+			err(1, "waitpid(%d)", pid);
 	} else
 		err(1, "fork(), %s:%d",  __FILE__, __LINE__);