From owner-svn-src-projects@FreeBSD.ORG Wed Oct 12 11:38:44 2011 Return-Path: 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 B3E52106566B; Wed, 12 Oct 2011 11:38:44 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A29888FC12; Wed, 12 Oct 2011 11:38:44 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9CBciKM064514; Wed, 12 Oct 2011 11:38:44 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9CBciKs064501; Wed, 12 Oct 2011 11:38:44 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <201110121138.p9CBciKs064501@svn.freebsd.org> From: Peter Holm Date: Wed, 12 Oct 2011 11:38:44 +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: r226300 - in projects/stress2/testcases: pty run shm socket swap syscall sysctl tcp thr1 thr2 udp X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Oct 2011 11:38:44 -0000 Author: pho Date: Wed Oct 12 11:38:44 2011 New Revision: 226300 URL: http://svn.freebsd.org/changeset/base/226300 Log: Issues found by adding -Wextra to CFLAGS. Modified: projects/stress2/testcases/pty/pty.c projects/stress2/testcases/run/run.c projects/stress2/testcases/shm/shm.c projects/stress2/testcases/socket/socket.c projects/stress2/testcases/swap/swap.c projects/stress2/testcases/syscall/syscall.c projects/stress2/testcases/sysctl/sysctl.c projects/stress2/testcases/tcp/tcp.c projects/stress2/testcases/thr1/thr1.c projects/stress2/testcases/thr2/thr2.c projects/stress2/testcases/udp/udp.c Modified: projects/stress2/testcases/pty/pty.c ============================================================================== --- projects/stress2/testcases/pty/pty.c Wed Oct 12 11:34:14 2011 (r226299) +++ projects/stress2/testcases/pty/pty.c Wed Oct 12 11:38:44 2011 (r226300) @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); #define TXT "Hello, world!" int -setup(int nb) +setup(int nb __unused) { return (0); } Modified: projects/stress2/testcases/run/run.c ============================================================================== --- projects/stress2/testcases/run/run.c Wed Oct 12 11:34:14 2011 (r226299) +++ projects/stress2/testcases/run/run.c Wed Oct 12 11:38:44 2011 (r226300) @@ -46,7 +46,7 @@ static char *av[MAXAV]; static int loop = 1; int -setup(int nb) +setup(int nb __unused) { return (0); } Modified: projects/stress2/testcases/shm/shm.c ============================================================================== --- projects/stress2/testcases/shm/shm.c Wed Oct 12 11:34:14 2011 (r226299) +++ projects/stress2/testcases/shm/shm.c Wed Oct 12 11:38:44 2011 (r226300) @@ -57,7 +57,7 @@ size_t pgsize; pid_t pid; int -setup(int nb) +setup(int nb __unused) { int seed; Modified: projects/stress2/testcases/socket/socket.c ============================================================================== --- projects/stress2/testcases/socket/socket.c Wed Oct 12 11:34:14 2011 (r226299) +++ projects/stress2/testcases/socket/socket.c Wed Oct 12 11:38:44 2011 (r226300) @@ -67,14 +67,12 @@ reader(void) { static void writer(void) { - int i, *buf, r; + int i, *buf; - if (r < 0) - err(1, "connect(), %s:%d", __FILE__, __LINE__); if ((buf = malloc(bufsize)) == NULL) err(1, "malloc(%d), %s:%d", bufsize, __FILE__, __LINE__); - for (i = 0; i < bufsize / sizeof(int); i++) + for (i = 0; i < bufsize / (int)sizeof(int); i++) buf[i] = i; for (;;) { Modified: projects/stress2/testcases/swap/swap.c ============================================================================== --- projects/stress2/testcases/swap/swap.c Wed Oct 12 11:34:14 2011 (r226299) +++ projects/stress2/testcases/swap/swap.c Wed Oct 12 11:38:44 2011 (r226300) @@ -45,7 +45,7 @@ static unsigned long size; int setup(int nb) { - int pct; + int pct = 0; unsigned long mem; int64_t swapinfo = 0; struct rlimit rlp; @@ -101,8 +101,8 @@ int test(void) { char *c; - int i, page; - unsigned long oldsize = size; + int page; + unsigned long i, oldsize = size; time_t start; c = malloc(size); @@ -118,7 +118,7 @@ test(void) while (done_testing == 0 && (time(NULL) - start) < op->run_time) { i = 0; - while (i < size && done_testing == 0) { + while (i < (int)size && done_testing == 0) { c[i] = 0; i += page; } Modified: projects/stress2/testcases/syscall/syscall.c ============================================================================== --- projects/stress2/testcases/syscall/syscall.c Wed Oct 12 11:34:14 2011 (r226299) +++ projects/stress2/testcases/syscall/syscall.c Wed Oct 12 11:38:44 2011 (r226300) @@ -65,7 +65,7 @@ static int ignore[] = { }; int -setup(int nb) +setup(int nb __unused) { int i; struct rlimit rl; @@ -80,7 +80,7 @@ setup(int nb) if (op->argc == 1) { num = atoi(op->argv[0]); - for (i = 0; i < sizeof(ignore) / sizeof(ignore[0]); i++) + for (i = 0; i < (int)sizeof(ignore) / (int)sizeof(ignore[0]); i++) if (num == ignore[i]) { printf("syscall %d is marked a no test!\n", num); exit(1); @@ -89,7 +89,7 @@ setup(int nb) num = 0; while (num == 0) { num = random_int(0, SYS_MAXSYSCALL); - for (i = 0; i < sizeof(ignore) / sizeof(ignore[0]); i++) + for (i = 0; i < (int)sizeof(ignore) / (int)sizeof(ignore[0]); i++) if (num == ignore[i]) { num = 0; break; Modified: projects/stress2/testcases/sysctl/sysctl.c ============================================================================== --- projects/stress2/testcases/sysctl/sysctl.c Wed Oct 12 11:34:14 2011 (r226299) +++ projects/stress2/testcases/sysctl/sysctl.c Wed Oct 12 11:38:44 2011 (r226300) @@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$"); #include "stress.h" int -setup(int nb) +setup(int nb __unused) { return (0); } Modified: projects/stress2/testcases/tcp/tcp.c ============================================================================== --- projects/stress2/testcases/tcp/tcp.c Wed Oct 12 11:34:14 2011 (r226299) +++ projects/stress2/testcases/tcp/tcp.c Wed Oct 12 11:38:44 2011 (r226300) @@ -134,7 +134,7 @@ writer(void) { if ((buf = malloc(bufsize)) == NULL) err(1, "malloc(%d), %s:%d", bufsize, __FILE__, __LINE__); - for (i = 0; i < bufsize / sizeof(int); i++) + for (i = 0; i < bufsize / (int)sizeof(int); i++) buf[i] = i; for (;;) { Modified: projects/stress2/testcases/thr1/thr1.c ============================================================================== --- projects/stress2/testcases/thr1/thr1.c Wed Oct 12 11:34:14 2011 (r226299) +++ projects/stress2/testcases/thr1/thr1.c Wed Oct 12 11:38:44 2011 (r226300) @@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$"); #define NTHREADS 256 int -setup(int nb) +setup(int nb __unused) { return (0); } @@ -53,7 +53,7 @@ cleanup(void) } void * -thr_routine(void *arg) +thr_routine(void *arg __unused) { (void) getpid(); return (0); Modified: projects/stress2/testcases/thr2/thr2.c ============================================================================== --- projects/stress2/testcases/thr2/thr2.c Wed Oct 12 11:34:14 2011 (r226299) +++ projects/stress2/testcases/thr2/thr2.c Wed Oct 12 11:38:44 2011 (r226300) @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); volatile int done = 0; int -setup(int nb) +setup(int nb __unused) { return (0); } @@ -55,13 +55,13 @@ cleanup(void) } void * -thr1(void *arg) +thr1(void *arg __unused) { return (0); } void * -thr2(void *arg) +thr2(void *arg __unused) { while (done == 0) pthread_yield(); Modified: projects/stress2/testcases/udp/udp.c ============================================================================== --- projects/stress2/testcases/udp/udp.c Wed Oct 12 11:34:14 2011 (r226299) +++ projects/stress2/testcases/udp/udp.c Wed Oct 12 11:38:44 2011 (r226300) @@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$"); static int bufsize; int -setup(int nb) +setup(int nb __unused) { bufsize = 2 << random_int(1, 12); return (0); @@ -86,7 +86,7 @@ test(void) } else { sock_in.sin_family = AF_INET; sock_in.sin_addr.s_addr = inet_addr(hostname); - if (sock_in.sin_addr.s_addr == -1) { + if (sock_in.sin_addr.s_addr == INADDR_NONE) { err(1, "host: %s", hostname); } } From owner-svn-src-projects@FreeBSD.ORG Wed Oct 12 15:56:15 2011 Return-Path: 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 9C7281065672; Wed, 12 Oct 2011 15:56:15 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8CBFB8FC19; Wed, 12 Oct 2011 15:56:15 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9CFuF1l072937; Wed, 12 Oct 2011 15:56:15 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9CFuF0r072935; Wed, 12 Oct 2011 15:56:15 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <201110121556.p9CFuF0r072935@svn.freebsd.org> From: Peter Holm Date: Wed, 12 Oct 2011 15:56:15 +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: r226308 - projects/stress2/testcases/fts X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Oct 2011 15:56:15 -0000 Author: pho Date: Wed Oct 12 15:56:15 2011 New Revision: 226308 URL: http://svn.freebsd.org/changeset/base/226308 Log: Added missing check for test done. Marked unused parameter. Modified: projects/stress2/testcases/fts/fts.c Modified: projects/stress2/testcases/fts/fts.c ============================================================================== --- projects/stress2/testcases/fts/fts.c Wed Oct 12 15:43:56 2011 (r226307) +++ projects/stress2/testcases/fts/fts.c Wed Oct 12 15:56:15 2011 (r226308) @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); #include "stress.h" int -setup(int nb) +setup(int nb __unused) { return (0); } @@ -70,7 +70,7 @@ test(void) if ((fts = fts_open(args, ftsoptions, NULL)) == NULL) err(1, "fts_open"); - while ((p = fts_read(fts)) != NULL) { + while ((p = fts_read(fts)) != NULL && done_testing == 0) { if (op->verbose > 1) (void) printf("%s\n", p->fts_path); switch (p->fts_info) { From owner-svn-src-projects@FreeBSD.ORG Wed Oct 12 15:59:29 2011 Return-Path: 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 B6CFF106564A; Wed, 12 Oct 2011 15:59:29 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A6BB68FC08; Wed, 12 Oct 2011 15:59:29 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9CFxTRc073066; Wed, 12 Oct 2011 15:59:29 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9CFxTBh073064; Wed, 12 Oct 2011 15:59:29 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <201110121559.p9CFxTBh073064@svn.freebsd.org> From: Peter Holm Date: Wed, 12 Oct 2011 15:59:29 +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: r226309 - projects/stress2/testcases/lockf2 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Oct 2011 15:59:29 -0000 Author: pho Date: Wed Oct 12 15:59:29 2011 New Revision: 226309 URL: http://svn.freebsd.org/changeset/base/226309 Log: Added reservation of disk space. Added check for test done. Modified: projects/stress2/testcases/lockf2/lockf2.c Modified: projects/stress2/testcases/lockf2/lockf2.c ============================================================================== --- projects/stress2/testcases/lockf2/lockf2.c Wed Oct 12 15:56:15 2011 (r226308) +++ projects/stress2/testcases/lockf2/lockf2.c Wed Oct 12 15:59:29 2011 (r226309) @@ -50,13 +50,39 @@ __FBSDID("$FreeBSD$"); char file[128]; int fd; +int freespace; int setup(int nb) { + int64_t bl; + int64_t in; + int64_t reserve_bl; + int64_t reserve_in; int i; char buf[1024]; + if (nb == 0) { + getdf(&bl, &in); + + /* Resource requirements: */ + reserve_in = 1 * op->incarnations + 2; + reserve_bl = 1064960 * op->incarnations + 2048; + freespace = (reserve_bl <= bl && reserve_in <= in); + if (!freespace) + reserve_bl = reserve_in = 0; + + if (op->verbose > 1) + printf("lockf2(incarnations=%d). Free(%jdk, %jd), reserve(%jdk, %jd)\n", + op->incarnations, bl/1024, in, reserve_bl/1024, reserve_in); + reservedf(reserve_bl, reserve_in); + putval(freespace); + } else { + freespace = getval(); + } + if (!freespace) + _exit (0); + sprintf(file, "lockf.%d", getpid()); if ((fd = open(file,O_CREAT | O_TRUNC | O_RDWR, 0600)) == -1) err(1, "creat(%s)", file); @@ -84,7 +110,7 @@ test(void) if ((fd = open(file, O_RDWR, 0600)) == -1) err(1, "open(%s)", file); - for (i = 0; i < 1024; i++) { + for (i = 0; i < 1024 && done_testing == 0; i++) { pos = random_int(0, 1024 * 1024 - 1); if (lseek(fd, pos, SEEK_SET) == -1) err(1, "lseek");