From owner-svn-src-user@FreeBSD.ORG Wed Sep 24 09:25:48 2014 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 ESMTPS id 964A5FA1; Wed, 24 Sep 2014 09:25:48 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 821D2B0A; Wed, 24 Sep 2014 09:25:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8O9Pm69068579; Wed, 24 Sep 2014 09:25:48 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8O9Pm1G068578; Wed, 24 Sep 2014 09:25:48 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201409240925.s8O9Pm1G068578@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Wed, 24 Sep 2014 09:25:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r272061 - 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.18-1 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: Wed, 24 Sep 2014 09:25:48 -0000 Author: pho Date: Wed Sep 24 09:25:47 2014 New Revision: 272061 URL: http://svnweb.freebsd.org/changeset/base/272061 Log: Style fixes. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/mmap19.sh Modified: user/pho/stress2/misc/mmap19.sh ============================================================================== --- user/pho/stress2/misc/mmap19.sh Wed Sep 24 08:28:34 2014 (r272060) +++ user/pho/stress2/misc/mmap19.sh Wed Sep 24 09:25:47 2014 (r272061) @@ -39,8 +39,7 @@ here=`pwd` cd /tmp sed '1,/^EOF/d' < $here/$0 > mmap19.c cc -o mmap19 -Wall -Wextra -O2 mmap19.c -lpthread || exit 1 -rm -f mmap19.c /tmp/mmap19.core -rm -f /tmp/mmap19.core +rm -f mmap19.c daemon sh -c "(cd $here/../testcases/swap; ./swap -t 2m -i 20 -k)" rnd=`od -An -N1 -t u1 /dev/random | sed 's/ //g'` @@ -54,6 +53,12 @@ rm -f /tmp/mmap19 /tmp/mmap19.core exit 0 EOF #include +#include +#include +#include +#include +#include + #include #include #include @@ -64,27 +69,21 @@ EOF #include #include #include -#include -#include -#include -#include -#include #include #include -#define PARALLEL 50 #define LOOPS 50 - -void *p; - #define N (128 * 1024 / (int)sizeof(u_int32_t)) +#define PARALLEL 50 + u_int32_t r[N]; +void *p; unsigned long makearg(void) { - unsigned int i; unsigned long val; + unsigned int i; val = arc4random(); i = arc4random() % 100; @@ -115,30 +114,32 @@ makeptr(void) else val = makearg(); val = trunc_page(val); + return ((void *)val); } void * tmmap(void *arg __unused) { - int i, fd; size_t len; + int i, fd; pthread_set_name_np(pthread_self(), __func__); len = 1LL * 1024 * 1024 * 1024; for (i = 0; i < 100; i++) { - if ((fd = open("/dev/zero", O_CREAT | O_TRUNC | O_RDWR, 0622)) == -1) + if ((fd = open("/dev/zero", O_CREAT | O_TRUNC | O_RDWR, + 0622)) == -1) err(1,"open()"); - if ((p = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0)) != - MAP_FAILED) { + if ((p = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_PRIVATE, + fd, 0)) != MAP_FAILED) { usleep(100); munmap(p, len); } - if ((p = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_ANON, -1, 0)) != - MAP_FAILED) { + if ((p = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_ANON, -1, + 0)) != MAP_FAILED) { usleep(100); munmap(p, len); } @@ -151,9 +152,9 @@ tmmap(void *arg __unused) void * tmprotect(void *arg __unused) { - int i, n, prot; const void *addr; size_t len; + int i, n, prot; pthread_set_name_np(pthread_self(), __func__); n = 0; @@ -166,16 +167,17 @@ tmprotect(void *arg __unused) usleep(1000); } if (n < 10) - fprintf(stderr, "tmprotect() only succeeded %d times.\n", n); + fprintf(stderr, "Note: tmprotect() only succeeded %d times.\n", + n); + return (NULL); } void test(void) { - int i; - int rc; pthread_t tid[2]; + int i, rc; if ((rc = pthread_create(&tid[0], NULL, tmmap, NULL)) != 0) errc(1, rc, "tmmap()"); @@ -193,14 +195,15 @@ test(void) for (i = 0; i < 2; i++) if ((rc = pthread_join(tid[i], NULL)) != 0) errc(1, rc, "pthread_join(%d)", i); + _exit(0); } int main(void) { - int i, j; struct rlimit rl; + int i, j; rl.rlim_max = rl.rlim_cur = 0; if (setrlimit(RLIMIT_CORE, &rl) == -1)