From owner-dev-commits-src-all@freebsd.org Sun Jul 4 13:55:49 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6E106665823; Sun, 4 Jul 2021 13:55:49 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4GHr1w2WDqz58TG; Sun, 4 Jul 2021 13:55:47 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id 164Dte9Q021028; Sun, 4 Jul 2021 06:55:40 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id 164Dtexu021027; Sun, 4 Jul 2021 06:55:40 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <202107041355.164Dtexu021027@gndrsh.dnsmgr.net> Subject: Re: git: 5bd70f050072 - main - stress2: Improve cleanup code In-Reply-To: <202107020525.1625PhAd078350@gitrepo.freebsd.org> To: Peter Holm Date: Sun, 4 Jul 2021 06:55:40 -0700 (PDT) CC: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 4GHr1w2WDqz58TG X-Spamd-Bar: +++ Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of freebsd@gndrsh.dnsmgr.net has no SPF policy when checking 69.59.192.140) smtp.mailfrom=freebsd@gndrsh.dnsmgr.net X-Spamd-Result: default: False [3.90 / 15.00]; HAS_REPLYTO(0.00)[rgrimes@freebsd.org]; ARC_NA(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[69.59.192.140:from]; AUTH_NA(1.00)[]; DMARC_NA(0.00)[dnsmgr.net]; SPAMHAUS_ZRD(0.00)[69.59.192.140:from:127.0.2.255]; NEURAL_SPAM_MEDIUM(1.00)[1.000]; RCVD_TLS_LAST(0.00)[]; NEURAL_SPAM_SHORT(1.00)[0.999]; NEURAL_SPAM_LONG(1.00)[1.000]; R_SPF_NA(0.00)[no SPF record]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[dev-commits-src-all,dev-commits-src-main] X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Jul 2021 13:55:49 -0000 > The branch main has been updated by pho: > > URL: https://cgit.FreeBSD.org/src/commit/?id=5bd70f050072bced1f0b7a566932857b3dd506ef > > commit 5bd70f050072bced1f0b7a566932857b3dd506ef > Author: Peter Holm > AuthorDate: 2021-07-02 05:22:18 +0000 > Commit: Peter Holm > CommitDate: 2021-07-02 05:22:18 +0000 > > stress2: Improve cleanup code > --- > tools/test/stress2/misc/mmap3.sh | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/tools/test/stress2/misc/mmap3.sh b/tools/test/stress2/misc/mmap3.sh > index bc5905dd920e..9175b77842f3 100755 > --- a/tools/test/stress2/misc/mmap3.sh > +++ b/tools/test/stress2/misc/mmap3.sh > @@ -42,11 +42,12 @@ while [ `date '+%s'` -lt $((start + 5 * 60)) ]; do > ./mmap3 > done > echo "Expect Segmentation faults" > +trap "rm -f /tmp/mmap3.0*" EXIT INT > start=`date '+%s'` > while [ `date '+%s'` -lt $((start + 5 * 60)) ]; do > ./mmap3 random > done > -rm -f mmap3 mmap3.core /tmp/mmap.0* > +rm -f mmap3 mmap3.core /tmp/mmap3.0* I have never liked the use of * in a "cleanup" when there is more information about the form of the file name: mmap3.??????.???? would be better, and it also fixes the assumption that there is always a leading zero, which the format string does not specify (yes, it says to leading zero fill, but that does not mean it shall always start with a zero). A more precise: mmap3.[0-9][0-9][0-9][0-9][0-9][0-9].[0-9][0-9][0-9][0-9] could also be used, but is kinda long winded. > exit > > EOF > @@ -102,7 +103,7 @@ work(int nr) > p = (void *)STARTADDR; > len = ADRSPACE; > > - sprintf(path, "/tmp/mmap.%06d.%04d", getpid(), nr); > + sprintf(path, "/tmp/mmap3.%06d.%04d", getpid(), nr); > if ((fd = open(path, O_CREAT | O_TRUNC | O_RDWR, 0622)) == -1) > err(1,"open()"); > if (ftruncate(fd, len) == -1) > -- Rod Grimes rgrimes@freebsd.org