From owner-svn-src-user@FreeBSD.ORG Tue Apr 22 07:17:49 2014 Return-Path: Delivered-To: svn-src-user@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 7363941E; Tue, 22 Apr 2014 07:17:49 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4542D1CD2; Tue, 22 Apr 2014 07:17:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3M7HnFi083977; Tue, 22 Apr 2014 07:17:49 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3M7HnnP083976; Tue, 22 Apr 2014 07:17:49 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <201404220717.s3M7HnnP083976@svn.freebsd.org> From: Peter Holm Date: Tue, 22 Apr 2014 07:17:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r264751 - 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.17 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: Tue, 22 Apr 2014 07:17:49 -0000 Author: pho Date: Tue Apr 22 07:17:48 2014 New Revision: 264751 URL: http://svnweb.freebsd.org/changeset/base/264751 Log: Do not sleep during benchmark, do not use abort(3) and rename log file. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/pthread2.sh Modified: user/pho/stress2/misc/pthread2.sh ============================================================================== --- user/pho/stress2/misc/pthread2.sh Tue Apr 22 07:16:05 2014 (r264750) +++ user/pho/stress2/misc/pthread2.sh Tue Apr 22 07:17:48 2014 (r264751) @@ -35,9 +35,9 @@ here=`pwd` cd /tmp sed '1,/^EOF/d' < $here/$0 > pthread2.c cc -o pthread2 -Wall -Wextra -O2 -g pthread2.c -lpthread || exit 1 -rm -f pthread2.c +rm -f pthread2.c /tmp/pthread2.core -log=/tmp/bench.`date '+%Y%m%d-%H%M'` +log=/tmp/pthread2.`date '+%Y%m%d-%H%M'` for i in `jot 5`; do [ $i -eq 1 ] && echo "# `uname -v`" time sh -c ' @@ -52,12 +52,15 @@ done > $log 2>&1 rm -f /tmp/pthread2 if [ -n "$bench" ]; then - pair=`ls /tmp/bench* | egrep "bench\.[0-9]{8}-" | sort | + pair=`ls /tmp/pthread2* | egrep "pthread2\.[0-9]{8}-" | sort | tail -2 | tr '\n' ' '` ministat -w 72 $pair else rm -f $log fi + +# __thr_umutex_lock() may call abort(3) under VM pressure. +[ -r /tmp/pthread2.core ] && echo FAIL exit 0 EOF /* @@ -92,7 +95,7 @@ EOF #define WAIT(x) pwait(&x.wait, &x.mtx) long ncreate, nrename, nunlink; -int max; +int bench, max; char *dirname1; char *dirname2; @@ -121,7 +124,7 @@ static void ahand(int i __unused) { /* handler */ fprintf(stderr, "FAIL\n"); hand(0); - abort(); + _exit(0); } void @@ -178,7 +181,7 @@ loop_create(void *arg __unused) ncreate++; UNLOCK(newfiles); SIGNAL(newfiles); - if ((i > 0) && (i % 100000 == 0)) + if ((bench == 0) && (i > 0) && (i % 100000 == 0)) for (j = 0; j < 10 && ncreate != nrename; j++) usleep(400); } @@ -247,6 +250,7 @@ main(void) int rc; pthread_t tid[3]; + bench = getenv("bench") != NULL; asprintf(&dirname1, "%s.1", "f1"); asprintf(&dirname2, "%s.2", "f2"); max = 15000000;