Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 4 Nov 2013 11:43:04 +0000 (UTC)
From:      Peter Holm <pho@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r257627 - user/pho/stress2/misc
Message-ID:  <201311041143.rA4Bh4t8047505@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pho
Date: Mon Nov  4 11:43:04 2013
New Revision: 257627
URL: http://svnweb.freebsd.org/changeset/base/257627

Log:
  Added a timeout and did some cleanup.
  
  Sponsored by:	EMC / Isilon storage division

Modified:
  user/pho/stress2/misc/truncate.sh

Modified: user/pho/stress2/misc/truncate.sh
==============================================================================
--- user/pho/stress2/misc/truncate.sh	Mon Nov  4 09:01:52 2013	(r257626)
+++ user/pho/stress2/misc/truncate.sh	Mon Nov  4 11:43:04 2013	(r257627)
@@ -35,7 +35,7 @@
 here=`pwd`
 cd /tmp
 sed '1,/^EOF/d' < $here/$0 > truncate.c
-cc -o truncate -Wall -O2 truncate.c
+cc -o truncate -Wall -Wextra -O2 truncate.c || exit 1
 rm -f truncate.c
 [ -d $RUNDIR ] || mkdir -p $RUNDIR
 cd $RUNDIR
@@ -49,6 +49,7 @@ EOF
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <time.h>
 #include <unistd.h>
 #include <sys/wait.h>
 
@@ -58,6 +59,7 @@ char buf[SIZ];
 void
 test(void)
 {
+	time_t start;
 	int fd[10], i, j;
 	char name[128];
 
@@ -68,7 +70,10 @@ test(void)
 		unlink(name);
 	}
 
+	start = time(NULL);
 	for (i = 0; i < 100000; i++) {
+		if (time(NULL) - start > 1200)
+			break;
 		for (j = 0; j < 10; j++) {
 			if (write(fd[j], buf, 2) != 2)
 				err(1, "write");
@@ -77,10 +82,11 @@ test(void)
 		}
 	}
 
-	exit(0);
+	_exit(0);
 }
+
 int
-main(int argc, char **argv)
+main(void)
 {
 	int i, status;
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311041143.rA4Bh4t8047505>