From owner-svn-src-user@freebsd.org Mon May 29 11:17:00 2017 Return-Path: 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 A62AECFC255 for ; Mon, 29 May 2017 11:17:00 +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 75C3C75407; Mon, 29 May 2017 11:17:00 +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 v4TBGxbe051905; Mon, 29 May 2017 11:16:59 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4TBGxYd051904; Mon, 29 May 2017 11:16:59 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705291116.v4TBGxYd051904@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 29 May 2017 11:16:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r319123 - user/pho/stress2/misc 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 " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 May 2017 11:17:00 -0000 Author: pho Date: Mon May 29 11:16:59 2017 New Revision: 319123 URL: https://svnweb.freebsd.org/changeset/base/319123 Log: Return exit status. Cleanup code while here. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/nfsrename.sh Modified: user/pho/stress2/misc/nfsrename.sh ============================================================================== --- user/pho/stress2/misc/nfsrename.sh Mon May 29 11:14:08 2017 (r319122) +++ user/pho/stress2/misc/nfsrename.sh Mon May 29 11:16:59 2017 (r319123) @@ -47,15 +47,18 @@ rm -f nfsrename.c cd $odir mount | grep "$mntpoint" | grep nfs > /dev/null && umount $mntpoint -mount -t nfs -o tcp -o retrycnt=3 -o intr -o soft -o rw $nfs_export $mntpoint +mount -t nfs -o tcp -o retrycnt=3 -o intr,soft -o rw $nfs_export $mntpoint for i in `jot 10`; do - /tmp/nfsrename $mntpoint/nfsrename.$i & + /tmp/nfsrename $mntpoint/nfsrename.$i > /dev/null 2>&1 & + pids="$pids $!" done -for i in `jot 10`; do - wait +s=0 +for i in $pids; do + wait $i + [ $? -ne 0 ] && s=1 done -killall nfsrename +pkill nfsrename rm -f $mntpoint/nfsrename.* umount $mntpoint > /dev/null 2>&1 @@ -64,7 +67,7 @@ while mount | grep "$mntpoint" | grep -q done rm -f /tmp/nfsrename -exit +exit $s EOF /* @@ -81,10 +84,13 @@ EOF #include #include #include +#include #include -const char *filename; -const char *dir; +static char *filename; +static char *dir; + +#define RUNTIME 720 static void usage(void) @@ -102,7 +108,6 @@ read_file(void) fp = fopen(filename, "r"); if (fp == NULL) { - warn("fopen"); return; } while (!feof(fp)) { @@ -130,7 +135,7 @@ write_file(void) fp = fdopen(fd, "w"); if (fp == NULL) { - warn("fopen:writer"); + warn("fdopen:writer"); close(fd); unlink(path); } @@ -155,10 +160,14 @@ random_sleep(int base, int slop) static void child(void) { + time_t start; + start = time(NULL); for (;;) { random_sleep(500, 50); read_file(); + if (time(NULL) - start > RUNTIME) + errx(1, "Timed out"); } exit(0); } @@ -166,6 +175,7 @@ child(void) int main(int ac, char **av) { + time_t start; long i, nchild; char *cp; int ch; @@ -205,9 +215,12 @@ main(int ac, char **av) } } + start = time(NULL); for (i = 0; i < 10000; i++) { random_sleep(1500, 1000); write_file(); + if (time(NULL) - start > RUNTIME) + errx(1, "Timed out"); } return (0);