From owner-svn-src-projects@FreeBSD.ORG  Sat May 22 11:38:07 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7C6E6106566C;
	Sat, 22 May 2010 11:38:07 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6C0A38FC0A;
	Sat, 22 May 2010 11:38:07 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o4MBc7WC044541;
	Sat, 22 May 2010 11:38:07 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4MBc7wJ044537;
	Sat, 22 May 2010 11:38:07 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <201005221138.o4MBc7wJ044537@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Sat, 22 May 2010 11:38:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r208415 - in projects/stress2: include lib
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 May 2010 11:38:07 -0000

Author: pho
Date: Sat May 22 11:38:06 2010
New Revision: 208415
URL: http://svn.freebsd.org/changeset/base/208415

Log:
  Only print the name of the test program if run.

Modified:
  projects/stress2/include/stress.h
  projects/stress2/lib/main.c
  projects/stress2/lib/options.c

Modified: projects/stress2/include/stress.h
==============================================================================
--- projects/stress2/include/stress.h	Sat May 22 08:30:47 2010	(r208414)
+++ projects/stress2/include/stress.h	Sat May 22 11:38:06 2010	(r208415)
@@ -60,6 +60,7 @@ extern void putval(unsigned long);
 extern unsigned long getval(void);
 extern void getdf(int64_t *, int64_t *);
 extern void reservedf(int64_t, int64_t);
+extern void show_status(void);
 extern int64_t swap(void);
 extern unsigned long usermem(void);
 #endif

Modified: projects/stress2/lib/main.c
==============================================================================
--- projects/stress2/lib/main.c	Sat May 22 08:30:47 2010	(r208414)
+++ projects/stress2/lib/main.c	Sat May 22 11:38:06 2010	(r208415)
@@ -152,6 +152,8 @@ run_test(void)
 	if (random_int(1,100) > op->load)
 		return (status);
 
+	show_status();
+
 	start = time(NULL);
 	done_testing = 0;
 	fflush(stdout);

Modified: projects/stress2/lib/options.c
==============================================================================
--- projects/stress2/lib/options.c	Sat May 22 08:30:47 2010	(r208414)
+++ projects/stress2/lib/options.c	Sat May 22 11:38:06 2010	(r208415)
@@ -144,9 +144,6 @@ void
 options(int argc, char **argv)
 {
 	int ch;
-	int days;
-	time_t t;
-	char buf[80];
 
 	op = &opt;
 
@@ -206,6 +203,14 @@ options(int argc, char **argv)
 		op->run_time = 15;
 	if (op->load < 0 || op->load > 100)
 		op->load = 100;
+}
+
+void
+show_status(void)
+{
+	char buf[80];
+	int days;
+	time_t t;
 
 	if (op->verbose > 0) {
 		t = op->run_time;
@@ -218,7 +223,6 @@ options(int argc, char **argv)
 	}
 }
 
-
 void
 rmval(void)
 {