From owner-svn-src-user@FreeBSD.ORG Wed Jul 10 10:38:43 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id D480169A; Wed, 10 Jul 2013 10:38:43 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id ACB341236; Wed, 10 Jul 2013 10:38:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6AAch5S092145; Wed, 10 Jul 2013 10:38:43 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6AAchh9092144; Wed, 10 Jul 2013 10:38:43 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <201307101038.r6AAchh9092144@svn.freebsd.org> From: Peter Holm Date: Wed, 10 Jul 2013 10:38:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r253143 - user/pho/stress2/testcases/rw 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.14 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, 10 Jul 2013 10:38:43 -0000 Author: pho Date: Wed Jul 10 10:38:43 2013 New Revision: 253143 URL: http://svnweb.freebsd.org/changeset/base/253143 Log: Trim back file size a bit further. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/testcases/rw/rw.c Modified: user/pho/stress2/testcases/rw/rw.c ============================================================================== --- user/pho/stress2/testcases/rw/rw.c Wed Jul 10 10:15:38 2013 (r253142) +++ user/pho/stress2/testcases/rw/rw.c Wed Jul 10 10:38:43 2013 (r253143) @@ -73,10 +73,9 @@ setup(int nb) reserve_bl = size * 1024 * op->incarnations + (512 * 1024 * op->incarnations) + 64 * 1024; -// printf("-- size = %lu, reserve(%jd, %jd)\n", size, reserve_bl/1024, reserve_in); if (reserve_bl <= bl && reserve_in <= in) break; - size = size - 1024; + size = size / 10 * 8; } if (size == 0) reserve_bl = reserve_in = 0; @@ -91,6 +90,8 @@ setup(int nb) size = getval(); size = size * 1024; } + if (size == 0) + exit(0); umask(0); sprintf(path,"%s.%05d", getprogname(), getpid()); @@ -100,14 +101,13 @@ setup(int nb) if ((starting_dir = open(".", 0)) < 0) err(1, "."); - return (0); } void cleanup(void) { - if (size == 0) + if (starting_dir == 0) return; if (fchdir(starting_dir) == -1) err(1, "fchdir()"); @@ -133,15 +133,14 @@ test(void) int fd; char file[128]; - sprintf(file,"p%05d", getpid()); if ((fd = creat(file, 0660)) == -1) err(1, "creat(%s)", file); to = sizeof(buf); index = 0; - while (index < size) { - if (index + to > size) + while (index < (int)size) { + if (index + to > (int)size) to = size - index; #ifdef TEST for (i = 0; i < to; i++) @@ -158,8 +157,8 @@ test(void) err(1, "open(%s), %s:%d", file, __FILE__, __LINE__); index = 0; - while (index < size && done_testing == 0) { - if (index + to > size) + while (index < (int)size && done_testing == 0) { + if (index + to > (int)size) to = size - index; if (read(fd, buf, to) != to) err(1, "rw read. %s.%d", __FILE__, __LINE__);