From owner-svn-src-user@FreeBSD.ORG Tue Dec 3 18:15:28 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E1DA9543; Tue, 3 Dec 2013 18:15:28 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CD373171E; Tue, 3 Dec 2013 18:15:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB3IFSg3030331; Tue, 3 Dec 2013 18:15:28 GMT (envelope-from jmg@svn.freebsd.org) Received: (from jmg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB3IFS8G030329; Tue, 3 Dec 2013 18:15:28 GMT (envelope-from jmg@svn.freebsd.org) Message-Id: <201312031815.rB3IFS8G030329@svn.freebsd.org> From: John-Mark Gurney Date: Tue, 3 Dec 2013 18:15:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258874 - in user/pho/stress2/testcases: dirnprename dirrename 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.17 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: Tue, 03 Dec 2013 18:15:28 -0000 Author: jmg Date: Tue Dec 3 18:15:27 2013 New Revision: 258874 URL: http://svnweb.freebsd.org/changeset/base/258874 Log: two new test cases are comming, and I used rename.c as a basis... copy them incase someone wants to know their history, or merge bugs between them... Sponsored by: Imaginary Forces Reviewed by: pho Added: user/pho/stress2/testcases/dirnprename/ user/pho/stress2/testcases/dirnprename/dirnprename.c - copied unchanged from r258872, user/pho/stress2/testcases/rename/rename.c user/pho/stress2/testcases/dirrename/ user/pho/stress2/testcases/dirrename/dirrename.c - copied unchanged from r258872, user/pho/stress2/testcases/rename/rename.c Copied: user/pho/stress2/testcases/dirnprename/dirnprename.c (from r258872, user/pho/stress2/testcases/rename/rename.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/testcases/dirnprename/dirnprename.c Tue Dec 3 18:15:27 2013 (r258874, copy of r258872, user/pho/stress2/testcases/rename/rename.c) @@ -0,0 +1,138 @@ +/*- + * Copyright (c) 2008 Peter Holm + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "stress.h" + +static unsigned long size; + +int +setup(int nb) +{ + int64_t in; + int64_t bl; + int64_t reserve_in; + int64_t reserve_bl; + + umask(0); + + if (nb == 0) { + getdf(&bl, &in); + size = in / op->incarnations; + + if (size > 1000) + size = 1000; /* arbitrary limit number of files pr. dir */ + + /* Resource requirements: */ + while (size > 0) { + reserve_in = 2 * size * op->incarnations + 2 * op->incarnations; + reserve_bl = 30 * size * op->incarnations; +// printf("size = %lu, reserve(%jd, %jd)\n", size, reserve_bl/1024, reserve_in); + if (reserve_bl <= bl && reserve_in <= in) + break; + size = size / 2; + } + if (size == 0) + reserve_bl = reserve_in = 0; + + if (op->verbose > 1) + printf("rename(size=%lu, incarnations=%d). Free(%jdk, %jd), reserve(%jdk, %jd)\n", + size, op->incarnations, bl/1024, in, reserve_bl/1024, reserve_in); + reservedf(reserve_bl, reserve_in); + putval(size); + } else { + size = getval(); + } + if (size == 0) + exit(0); + + return (0); +} + +void +cleanup(void) +{ +} + +static void +test_rename(void) +{ + int i, j; + pid_t pid; + char file1[128]; + char file2[128]; + int tfd; + + pid = getpid(); + for (i = 0; i < (int)size; i++) { + sprintf(file1,"p%05d.%05d", pid, i); + if ((tfd = open(file1, O_RDONLY|O_CREAT, 0660)) == -1) + err(1, "openat(%s), %s:%d", file1, __FILE__, __LINE__); + close(tfd); + } + for (j = 0; j < 100 && done_testing == 0; j++) { + for (i = 0; i < (int)size; i++) { + sprintf(file1,"p%05d.%05d", pid, i); + sprintf(file2,"p%05d.%05d.togo", pid, i); + if (rename(file1, file2) == -1) + err(1, "rename(%s, %s). %s:%d", file1, file2, + __FILE__, __LINE__); + } + for (i = 0; i < (int)size; i++) { + sprintf(file1,"p%05d.%05d", pid, i); + sprintf(file2,"p%05d.%05d.togo", pid, i); + if (rename(file2, file1) == -1) + err(1, "rename(%s, %s). %s:%d", file2, file1, + __FILE__, __LINE__); + } + } + + for (i = 0; i < (int)size; i++) { + sprintf(file1,"p%05d.%05d", pid, i); + if (unlink(file1) == -1) + err(1, "unlink(%s), %s:%d", file1, __FILE__, __LINE__); + } +} + +int +test(void) +{ + test_rename(); + + return (0); +} Copied: user/pho/stress2/testcases/dirrename/dirrename.c (from r258872, user/pho/stress2/testcases/rename/rename.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/testcases/dirrename/dirrename.c Tue Dec 3 18:15:27 2013 (r258874, copy of r258872, user/pho/stress2/testcases/rename/rename.c) @@ -0,0 +1,138 @@ +/*- + * Copyright (c) 2008 Peter Holm + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "stress.h" + +static unsigned long size; + +int +setup(int nb) +{ + int64_t in; + int64_t bl; + int64_t reserve_in; + int64_t reserve_bl; + + umask(0); + + if (nb == 0) { + getdf(&bl, &in); + size = in / op->incarnations; + + if (size > 1000) + size = 1000; /* arbitrary limit number of files pr. dir */ + + /* Resource requirements: */ + while (size > 0) { + reserve_in = 2 * size * op->incarnations + 2 * op->incarnations; + reserve_bl = 30 * size * op->incarnations; +// printf("size = %lu, reserve(%jd, %jd)\n", size, reserve_bl/1024, reserve_in); + if (reserve_bl <= bl && reserve_in <= in) + break; + size = size / 2; + } + if (size == 0) + reserve_bl = reserve_in = 0; + + if (op->verbose > 1) + printf("rename(size=%lu, incarnations=%d). Free(%jdk, %jd), reserve(%jdk, %jd)\n", + size, op->incarnations, bl/1024, in, reserve_bl/1024, reserve_in); + reservedf(reserve_bl, reserve_in); + putval(size); + } else { + size = getval(); + } + if (size == 0) + exit(0); + + return (0); +} + +void +cleanup(void) +{ +} + +static void +test_rename(void) +{ + int i, j; + pid_t pid; + char file1[128]; + char file2[128]; + int tfd; + + pid = getpid(); + for (i = 0; i < (int)size; i++) { + sprintf(file1,"p%05d.%05d", pid, i); + if ((tfd = open(file1, O_RDONLY|O_CREAT, 0660)) == -1) + err(1, "openat(%s), %s:%d", file1, __FILE__, __LINE__); + close(tfd); + } + for (j = 0; j < 100 && done_testing == 0; j++) { + for (i = 0; i < (int)size; i++) { + sprintf(file1,"p%05d.%05d", pid, i); + sprintf(file2,"p%05d.%05d.togo", pid, i); + if (rename(file1, file2) == -1) + err(1, "rename(%s, %s). %s:%d", file1, file2, + __FILE__, __LINE__); + } + for (i = 0; i < (int)size; i++) { + sprintf(file1,"p%05d.%05d", pid, i); + sprintf(file2,"p%05d.%05d.togo", pid, i); + if (rename(file2, file1) == -1) + err(1, "rename(%s, %s). %s:%d", file2, file1, + __FILE__, __LINE__); + } + } + + for (i = 0; i < (int)size; i++) { + sprintf(file1,"p%05d.%05d", pid, i); + if (unlink(file1) == -1) + err(1, "unlink(%s), %s:%d", file1, __FILE__, __LINE__); + } +} + +int +test(void) +{ + test_rename(); + + return (0); +}