From nobody Thu Nov 25 11:46:01 2021 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id AD40118B0C57; Thu, 25 Nov 2021 11:46:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J0GKj3hGZz3jwt; Thu, 25 Nov 2021 11:46:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 561B11CE5E; Thu, 25 Nov 2021 11:46:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1APBk1XL069279; Thu, 25 Nov 2021 11:46:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1APBk1jm069278; Thu, 25 Nov 2021 11:46:01 GMT (envelope-from git) Date: Thu, 25 Nov 2021 11:46:01 GMT Message-Id: <202111251146.1APBk1jm069278@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Peter Holm Subject: git: 171e56c19a11 - main - stress2: Added an option to set the file size. Added missing error checks List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 171e56c19a11d39942929ea219b71b6b7b0398ae Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637840761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K04AdFh+V2CF28pEAAtr2U5ddQ9K83m06KGkWWoqHYY=; b=ubGrCPctOpElJQyjrnZNSgwVQpbnMFpz0f+eU7JnrgfjEYY7Zl9JTpgvNl3xa6ToLlO4lb cSHRhMVs45R1efnUcPTV/iD3xkQZ+KzNztWIe7cdfKUoNKBCFW/E1JojyuQh5+PdBt10Rp fIygVJZil8u0ryaJSS1Uvmhj/InxtFPbg7uPeuI9qjulrrCHLDZF6HQje4SdkOT4euKPi8 HzKkoT9mKzTr+bkB/rZtYOBlv7vHbleMPx2XAfu1RUEICGNo8eYCPd+nvsv5mhbxgPw6/I m2TxyEXUN9UK8Ux2JaAESZ9vhdIzm4Lsp01tfoQKcsPg/+TNjryi7YGCUH1tmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637840761; a=rsa-sha256; cv=none; b=EOJZiTEYr/JHEv+ESQKlIXXVN0Y2dTnknbD049b175Wj2FedGQOWx+lZ39dBNtoPiFIyMQ azCeWHXniUeNEYEXnviQ7QuCD0w0zImJX7SjP2KCIrurSsMkZwYbqTqPMoV+3ZVX2js5mB IMTs2vtpz4oZCh5kjSybyBjFR0GN+saSACyx6bge3gNpAHkyTRrNKEzY6f5Sr0Zj3JuQZ1 W4qWUd/iaZnkWPhs6Pc6Ld/SN9CB6piBXOU/nW2EJSEs1F/ZrdbGqE7l/XrlWRBC39P5uj nSpzzvK8sfHQLMZo+kLLje+J/jui1kEOOqGGz8FWRJVI29/zNjQEG4Hgv4FIqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=171e56c19a11d39942929ea219b71b6b7b0398ae commit 171e56c19a11d39942929ea219b71b6b7b0398ae Author: Peter Holm AuthorDate: 2021-11-25 11:44:59 +0000 Commit: Peter Holm CommitDate: 2021-11-25 11:44:59 +0000 stress2: Added an option to set the file size. Added missing error checks --- tools/test/stress2/tools/flip.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/tools/test/stress2/tools/flip.c b/tools/test/stress2/tools/flip.c index 816162947c45..8d01e9d78ea1 100644 --- a/tools/test/stress2/tools/flip.c +++ b/tools/test/stress2/tools/flip.c @@ -54,7 +54,7 @@ flip(void *ap, size_t len) { unsigned char *cp; int byte; - unsigned char bit, buf, mask, old; + unsigned char bit, buf, mask, old __unused; cp = (unsigned char *)ap; byte = random_long(0, len); @@ -75,15 +75,20 @@ main(int argc, char *argv[]) { struct stat st; off_t pos; + size_t size; int fd, i, times; char c; times = 1; - while ((c = getopt(argc, argv, "n:")) != -1) { + size = 0; + while ((c = getopt(argc, argv, "n:s:")) != -1) { switch (c) { case 'n': times = atoi(optarg); break; + case 's': + size = atol(optarg); + break; case '?': default: fprintf(stderr, @@ -103,18 +108,23 @@ main(int argc, char *argv[]) if ((fd = open(argv[0], O_RDWR)) == -1) err(1, "open(%s)", argv[0]); - if (fstat(fd, &st) == -1) - err(1, "stat %s", argv[0]); + if (size == 0) { + if (fstat(fd, &st) == -1) + err(1, "stat %s", argv[0]); + size = st.st_size; + } for (i = 0; i < times; i++) { - pos = arc4random() % st.st_size; + pos = arc4random() % size; if (lseek(fd, pos, SEEK_SET) == -1) err(1, "lseek()"); - read(fd, &c, 1); + if (read(fd, &c, 1) != 1) + err(1, "read()"); flip(&c, 1); if (lseek(fd, pos, SEEK_SET) == -1) err(1, "lseek()"); - write(fd, &c, 1); + if (write(fd, &c, 1) != 1) + err(1, "write()"); } return (0);