Date: Tue, 3 Oct 2017 07:03:11 +0000 (UTC) From: Peter Holm <pho@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r324232 - user/pho/stress2/misc Message-ID: <201710030703.v9373BI0089521@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pho Date: Tue Oct 3 07:03:11 2017 New Revision: 324232 URL: https://svnweb.freebsd.org/changeset/base/324232 Log: Return error code. Style fix. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/holdcnt0.sh user/pho/stress2/misc/holdcnt02.sh user/pho/stress2/misc/holdcnt03.sh Modified: user/pho/stress2/misc/holdcnt0.sh ============================================================================== --- user/pho/stress2/misc/holdcnt0.sh Tue Oct 3 07:01:24 2017 (r324231) +++ user/pho/stress2/misc/holdcnt0.sh Tue Oct 3 07:03:11 2017 (r324232) @@ -57,18 +57,19 @@ newfs md${mdstart}$part > /dev/null mount /dev/md${mdstart}$part $mntpoint (cd $mntpoint; /tmp/holdcnt0) & +pid=$! sleep 5 while kill -0 $! 2> /dev/null; do (cd ../testcases/swap; ./swap -t 1m -i 1) > /dev/null 2>&1 done -wait +wait $pid; s=$? while mount | grep -q md${mdstart}$part; do umount $mntpoint || sleep 1 done mdconfig -d -u $mdstart rm -f /tmp/holdcnt0 -exit 0 +exit $s EOF /* A test that causes the page daemon to generate cached pages @@ -77,6 +78,10 @@ EOF */ #include <sys/types.h> +#include <sys/mman.h> +#include <sys/stat.h> +#include <sys/wait.h> + #include <err.h> #include <errno.h> #include <fcntl.h> @@ -84,9 +89,6 @@ EOF #include <signal.h> #include <stdio.h> #include <stdlib.h> -#include <sys/mman.h> -#include <sys/stat.h> -#include <sys/wait.h> #include <time.h> #include <unistd.h> @@ -96,17 +98,17 @@ EOF #define WPARALLEL 2 static jmp_buf jbuf; -off_t maxsize; -int ps; +static off_t maxsize; +static int ps; static char *buf; -volatile char val; +static volatile char val; static void hand(int i __unused) { /* handler */ longjmp(jbuf, 1); } -void +static void cleanup(void) { int i; @@ -118,15 +120,16 @@ cleanup(void) } } -void +static void init(void) { - char file[80]; int fd, i; + char file[80]; for (i = 0; i < FILES; i++) { snprintf(file, sizeof(file), "f%06d", i); - if ((fd = open(file, O_RDWR | O_CREAT | O_TRUNC, 0644)) == -1) + if ((fd = open(file, O_RDWR | O_CREAT | O_TRUNC, 0644)) == + -1) err(1, "open(%s)", file); if (write(fd, buf, BUFSIZE) != BUFSIZE) err(1, "write"); @@ -135,13 +138,13 @@ init(void) } -void +static void writer(void) { + struct stat statbuf; + time_t start; int fd, i; char file[80]; - time_t start; - struct stat statbuf; setproctitle("writer"); start = time(NULL); @@ -170,14 +173,14 @@ err: _exit(0); } -void +static void reader(void) { - int fd, i, j, n; + struct stat statbuf; void *p; size_t len; + int fd, i, j, n; char file[80]; - struct stat statbuf; setproctitle("reader"); signal(SIGSEGV, hand); @@ -201,7 +204,8 @@ reader(void) continue; } len = statbuf.st_size; - if ((p = mmap(p, len, PROT_READ, MAP_SHARED, fd, 0)) == MAP_FAILED) + if ((p = mmap(p, len, PROT_READ, MAP_SHARED, fd, 0)) + == MAP_FAILED) err(1, "mmap()"); close(fd); n = statbuf.st_size / ps; @@ -220,28 +224,32 @@ reader(void) int main(void) { - int i; + pid_t rpid[RPARALLEL], wpid[WPARALLEL]; + int e, i, s; maxsize = 2LL * 1024 * 1024 * 1024 / FILES; buf = malloc(BUFSIZE); ps = getpagesize(); init(); + e = 0; for (i = 0; i < WPARALLEL; i++) { - if (fork() == 0) + if ((wpid[i] = fork()) == 0) writer(); } for (i = 0; i < RPARALLEL; i++) { - if (fork() == 0) + if ((rpid[i] = fork()) == 0) reader(); } for (i = 0; i < WPARALLEL; i++) - wait(NULL); + waitpid(wpid[i], &s, 0); + e += s == 0 ? 0 : 1; for (i = 0; i < RPARALLEL; i++) - wait(NULL); + waitpid(rpid[i], &s, 0); + e += s == 0 ? 0 : 1; free(buf); - return (0); + return (e); } Modified: user/pho/stress2/misc/holdcnt02.sh ============================================================================== --- user/pho/stress2/misc/holdcnt02.sh Tue Oct 3 07:01:24 2017 (r324231) +++ user/pho/stress2/misc/holdcnt02.sh Tue Oct 3 07:03:11 2017 (r324232) @@ -47,12 +47,13 @@ cd $here trap "rm -f /tmp/holdcnt02 `dirname $diskimage`/f000???" EXIT INT (cd `dirname $diskimage`; /tmp/holdcnt02) & +pid=$! sleep 5 while kill -0 $! 2> /dev/null; do (cd ../testcases/swap; ./swap -t 1m -i 1) > /dev/null 2>&1 done -wait -exit 0 +wait $pid +exit EOF /* A test that causes the page daemon to generate cached pages @@ -61,6 +62,10 @@ EOF */ #include <sys/types.h> +#include <sys/mman.h> +#include <sys/stat.h> +#include <sys/wait.h> + #include <err.h> #include <errno.h> #include <fcntl.h> @@ -68,9 +73,6 @@ EOF #include <signal.h> #include <stdio.h> #include <stdlib.h> -#include <sys/mman.h> -#include <sys/stat.h> -#include <sys/wait.h> #include <time.h> #include <unistd.h> @@ -80,17 +82,17 @@ EOF #define WPARALLEL 2 static jmp_buf jbuf; -off_t maxsize; -int ps; +static off_t maxsize; +static int ps; static char *buf; -volatile char val; +static volatile char val; static void hand(int i __unused) { /* handler */ longjmp(jbuf, 1); } -void +static void cleanup(void) { int i; @@ -102,15 +104,16 @@ cleanup(void) } } -void +static void init(void) { - char file[80]; int fd, i; + char file[80]; for (i = 0; i < FILES; i++) { snprintf(file, sizeof(file), "f%06d", i); - if ((fd = open(file, O_RDWR | O_CREAT | O_TRUNC, 0644)) == -1) + if ((fd = open(file, O_RDWR | O_CREAT | O_TRUNC, 0644)) == + -1) err(1, "open(%s)", file); if (write(fd, buf, BUFSIZE) != BUFSIZE) err(1, "write"); @@ -119,7 +122,7 @@ init(void) } -void +static void writer(void) { int fd, i; @@ -154,7 +157,7 @@ err: _exit(0); } -void +static void reader(void) { int fd, i, j, n; @@ -185,7 +188,8 @@ reader(void) continue; } len = statbuf.st_size; - if ((p = mmap(p, len, PROT_READ, MAP_SHARED, fd, 0)) == MAP_FAILED) + if ((p = mmap(p, len, PROT_READ, MAP_SHARED, fd, 0)) + == MAP_FAILED) err(1, "mmap()"); close(fd); n = statbuf.st_size / ps; @@ -204,28 +208,32 @@ reader(void) int main(void) { - int i; + pid_t rpid[RPARALLEL], wpid[WPARALLEL]; + int e, i, s; maxsize = 2LL * 1024 * 1024 * 1024 / FILES; buf = malloc(BUFSIZE); ps = getpagesize(); init(); + e = 0; for (i = 0; i < WPARALLEL; i++) { - if (fork() == 0) + if ((wpid[i] = fork()) == 0) writer(); } for (i = 0; i < RPARALLEL; i++) { - if (fork() == 0) + if ((rpid[i] = fork()) == 0) reader(); } for (i = 0; i < WPARALLEL; i++) - wait(NULL); + waitpid(wpid[i], &s, 0); + e += s == 0 ? 0 : 1; for (i = 0; i < RPARALLEL; i++) - wait(NULL); + waitpid(rpid[i], &s, 0); + e += s == 0 ? 0 : 1; free(buf); - return (0); + return (e); } Modified: user/pho/stress2/misc/holdcnt03.sh ============================================================================== --- user/pho/stress2/misc/holdcnt03.sh Tue Oct 3 07:01:24 2017 (r324231) +++ user/pho/stress2/misc/holdcnt03.sh Tue Oct 3 07:03:11 2017 (r324232) @@ -37,7 +37,7 @@ [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 [ `swapinfo | wc -l` -eq 1 ] && exit 0 -[ `sysctl -n hw.physmem` -lt $((9 * 1024 * 1024 * 1024)) ] && exit 0 +[ `sysctl -n hw.physmem` -lt $((32 * 1024 * 1024 * 1024)) ] && exit 0 . ../default.cfg @@ -50,12 +50,13 @@ cd $here trap "rm -f /tmp/holdcnt03 `dirname $diskimage`/f000???" EXIT INT (cd `dirname $diskimage`; /tmp/holdcnt03) & +pid=$! sleep 5 while kill -0 $! 2> /dev/null; do (cd ../testcases/swap; ./swap -t 1m -i 1) > /dev/null 2>&1 done -wait -exit 0 +wait $pid +exit EOF /* A test that causes the page daemon to generate cached pages @@ -64,6 +65,10 @@ EOF */ #include <sys/types.h> +#include <sys/mman.h> +#include <sys/stat.h> +#include <sys/wait.h> + #include <err.h> #include <errno.h> #include <fcntl.h> @@ -71,9 +76,6 @@ EOF #include <signal.h> #include <stdio.h> #include <stdlib.h> -#include <sys/mman.h> -#include <sys/stat.h> -#include <sys/wait.h> #include <time.h> #include <unistd.h> @@ -83,8 +85,8 @@ EOF #define WPARALLEL 2 static jmp_buf jbuf; -off_t maxsize; -int ps; +static off_t maxsize; +static int ps; static char *buf; static void @@ -92,7 +94,7 @@ hand(int i __unused) { /* handler */ longjmp(jbuf, 1); } -void +static void cleanup(void) { int i; @@ -104,7 +106,7 @@ cleanup(void) } } -void +static void init(void) { char file[80]; @@ -121,7 +123,7 @@ init(void) } -void +static void writer(void) { int fd, i; @@ -156,7 +158,7 @@ err: _exit(0); } -void +static void touch(void) { int fd, i, j, n; @@ -201,31 +203,36 @@ touch(void) } _exit(0); } + int main(void) { - int i; + pid_t rpid[RPARALLEL], wpid[WPARALLEL]; + int e, i, s; maxsize = 2LL * 1024 * 1024 * 1024 / FILES; buf = malloc(BUFSIZE); ps = getpagesize(); init(); + e = 0; for (i = 0; i < WPARALLEL; i++) { - if (fork() == 0) + if ((wpid[i] = fork()) == 0) writer(); } for (i = 0; i < RPARALLEL; i++) { - if (fork() == 0) + if ((rpid[i] = fork()) == 0) touch(); } for (i = 0; i < WPARALLEL; i++) - wait(NULL); + waitpid(wpid[i], &s, 0); + e += s == 0 ? 0 : 1; for (i = 0; i < RPARALLEL; i++) - wait(NULL); + waitpid(rpid[i], &s, 0); + e += s == 0 ? 0 : 1; free(buf); - return (0); + return (e); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710030703.v9373BI0089521>