From owner-svn-src-user@FreeBSD.ORG Tue Jul 30 06:37:11 2013 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 ESMTP id D4CFB25B; Tue, 30 Jul 2013 06:37:11 +0000 (UTC) (envelope-from pho@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 B30BE2647; Tue, 30 Jul 2013 06:37:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6U6bBcr005149; Tue, 30 Jul 2013 06:37:11 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6U6bAGC005146; Tue, 30 Jul 2013 06:37:10 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <201307300637.r6U6bAGC005146@svn.freebsd.org> From: Peter Holm Date: Tue, 30 Jul 2013 06:37:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r253791 - 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.14 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, 30 Jul 2013 06:37:12 -0000 Author: pho Date: Tue Jul 30 06:37:10 2013 New Revision: 253791 URL: http://svnweb.freebsd.org/changeset/base/253791 Log: Fix wrong mount point name, make test program name same as script name. Fix kinfo3.sh so it terminates properly. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/kinfo.sh user/pho/stress2/misc/kinfo2.sh user/pho/stress2/misc/kinfo3.sh Modified: user/pho/stress2/misc/kinfo.sh ============================================================================== --- user/pho/stress2/misc/kinfo.sh Tue Jul 30 02:26:06 2013 (r253790) +++ user/pho/stress2/misc/kinfo.sh Tue Jul 30 06:37:10 2013 (r253791) @@ -40,7 +40,7 @@ sed '1,/^EOF/d' < $odir/$0 > kinfo.c cc -o kinfo -Wall kinfo.c -lutil rm -f kinfo.c -mount | grep -q procfs || mount -t procfs procfs /procfs +mount | grep -q procfs || mount -t procfs procfs /proc for i in `jot 30`; do for j in `jot 5`; do /tmp/kinfo & Modified: user/pho/stress2/misc/kinfo2.sh ============================================================================== --- user/pho/stress2/misc/kinfo2.sh Tue Jul 30 02:26:06 2013 (r253790) +++ user/pho/stress2/misc/kinfo2.sh Tue Jul 30 06:37:10 2013 (r253791) @@ -36,14 +36,14 @@ odir=`pwd` cd /tmp -sed '1,/^EOF/d' < $odir/$0 > kinfo.c -cc -o kinfo -Wall kinfo.c -lutil -rm -f kinfo.c +sed '1,/^EOF/d' < $odir/$0 > kinfo2.c +cc -o kinfo2 -Wall kinfo2.c -lutil +rm -f kinfo2.c mount | grep -q procfs || mount -t procfs procfs /procfs for i in `jot 30`; do for j in `jot 5`; do - /tmp/kinfo & + /tmp/kinfo2 & done for j in `jot 5`; do @@ -51,7 +51,7 @@ for i in `jot 30`; do done done -rm -f /tmp/kinfo +rm -f /tmp/kinfo2 exit EOF Modified: user/pho/stress2/misc/kinfo3.sh ============================================================================== --- user/pho/stress2/misc/kinfo3.sh Tue Jul 30 02:26:06 2013 (r253790) +++ user/pho/stress2/misc/kinfo3.sh Tue Jul 30 06:37:10 2013 (r253791) @@ -36,14 +36,14 @@ odir=`pwd` cd /tmp -sed '1,/^EOF/d' < $odir/$0 > kinfo.c -cc -o kinfo -Wall kinfo.c -lutil -pthread -rm -f kinfo.c +sed '1,/^EOF/d' < $odir/$0 > kinfo3.c +cc -o kinfo3 -Wall kinfo3.c -lutil -pthread +rm -f kinfo3.c mount | grep -q procfs || mount -t procfs procfs /procfs for i in `jot 30`; do for j in `jot 5`; do - /tmp/kinfo & + /tmp/kinfo3 & done for j in `jot 5`; do @@ -51,7 +51,7 @@ for i in `jot 30`; do done done -rm -f /tmp/kinfo +rm -f /tmp/kinfo3 exit EOF @@ -72,10 +72,11 @@ EOF #include char buf[8096]; +int more; void handler(int i) { - exit(0); + more = 0; } void * @@ -98,7 +99,7 @@ churning(void) { pthread_t threads[5]; - for (;;) { + while(more) { r = fork(); if (r == 0) { for (i = 0; i < 5; i++) { @@ -119,6 +120,7 @@ churning(void) { } wait(&status); } + exit(0); } /* Get files for each proc */ @@ -174,9 +176,10 @@ main(int argc, char **argv) signal(SIGALRM, handler); alarm(30); + more = 1; if ((r = fork()) == 0) { alarm(30); - for (;;) + while(more) churning(); } if (r < 0) { @@ -184,7 +187,7 @@ main(int argc, char **argv) exit(2); } - for (;;) + while(more) list(); return (0);