From nobody Thu Jun 8 07:51:06 2023 X-Original-To: dev-commits-src-all@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 4QcGcB2sJ4z4byjQ; Thu, 8 Jun 2023 07:51:06 +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 4QcGcB1xG1z3LPm; Thu, 8 Jun 2023 07:51:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686210666; 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=6ZS5QTKdaIxcEeLhfX9b4LQUPwZpUmqYSkkUFTi89HU=; b=Z6+o69G9UajHAAXJLiZEyggf0nEuZh6SODp7nMolHnhrcu6yUiiLfTqA2XlfFHj0bAnhUm EO/lsIFs/OnQ7iP9FkbJ8QGb6dZ7BITqXJw3S9J0cIB00jlkgYkBZ69AgIraBUG+OaGib7 hLetI2BT1PnK1OrAyorwLqRp6qcAu0Vpd7hqQPQCpYY3BoYV8HpgfPV/lXCdape92JXQjx XeZgb4zKbV4HWmdU9ubQ8maUehtb4ZwHcwCHdVBLa6PXrFFMX6Cj3zkgxWEq2NT0Gkft+P zouBFYiLH0igLl9us26h71u7cIxFZL865tf5MHm7Gw5PUa5FnnTDcR8Ot5xQpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686210666; 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=6ZS5QTKdaIxcEeLhfX9b4LQUPwZpUmqYSkkUFTi89HU=; b=EAgqLI1OisGT6DHUV/oSw6L+4qXTRVnsLZypBdU+nE8VdTZYay6UbMqT/PR7xwBJ4uo7+2 TB+saY7YXfSVUUsUcGDmb3jy45L4Uu+aDX0jtBtEK1ZA9nDIqDtpRYmXBxyPSM4zxG3izd wWHjXZVfq62X57eADTKvZOV+1T70714TFv6K/N3+1clVZE0GWtLqwYk9unBsOK01mCHwEm w/oiuIJOTEkAhPjt1Jzht/3c4/zFJrHspH0R96pNOGPoBquUvZMe7XJuY463FAONkETHsf QDiUAZLtPd+9le8SE2I89dUhqb4TFDYy+xkNfYb8CMbgXNpz87v/CQD6WqHkyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686210666; a=rsa-sha256; cv=none; b=hmrlbpwF18dRAVuJ6T/5hNL+LIIazQp81ja+J65ePRkkI/lw9ctW5gjMthj3NHuGtWSDsx 7ku/BN0NG6jT2ZAP+hGYVu7sogtAOxC5lGwwIHz9geQTvXlcSpwwxTNxa80zhTHiMqQ4hB w2S28RNY+1pL5qNQRXXI6jqeJpQIh8x3WxgbfnJnd1W5fFUY1V7D9aacx5EW5NHzOIKND5 f5bKcodg9SAj34KhxfvToWnlmxojI+s3jBSXdxeoWUtjcC5qWdP8lAo/+th6iR8Uvx8sdJ LzDw3HgKpiFcNn0BbR8ehUAea7fb41aJst+LyE/AVcHAirfgJcEw2pZwvvJtbg== 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 4QcGcB1135zls1; Thu, 8 Jun 2023 07:51:06 +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 3587p6QB002455; Thu, 8 Jun 2023 07:51:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3587p6xe002454; Thu, 8 Jun 2023 07:51:06 GMT (envelope-from git) Date: Thu, 8 Jun 2023 07:51:06 GMT Message-Id: <202306080751.3587p6xe002454@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: 6b7a06c3bdbc - main - stress2: Avoid using "__unused" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 6b7a06c3bdbc17bc5ac450023bd0baadfaeefa78 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=6b7a06c3bdbc17bc5ac450023bd0baadfaeefa78 commit 6b7a06c3bdbc17bc5ac450023bd0baadfaeefa78 Author: Peter Holm AuthorDate: 2023-06-08 07:49:52 +0000 Commit: Peter Holm CommitDate: 2023-06-08 07:49:52 +0000 stress2: Avoid using "__unused" --- tools/test/stress2/misc/reaper2.sh | 8 ++++---- tools/test/stress2/misc/reaper3.sh | 11 +++++------ tools/test/stress2/misc/reaper4.sh | 11 +++++------ 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/tools/test/stress2/misc/reaper2.sh b/tools/test/stress2/misc/reaper2.sh index 1643e9985240..ee9cf927f1d9 100755 --- a/tools/test/stress2/misc/reaper2.sh +++ b/tools/test/stress2/misc/reaper2.sh @@ -65,8 +65,9 @@ test(void) { struct procctl_reaper_kill killemall; pid_t pid; time_t start; - int data[20], e, n __unused, m; + int data[20], debug, e, n, m; + debug = 0; /* set to 1 for debug output */ n = m = 0; if (procctl(P_PID, getpid(), PROC_REAP_ACQUIRE, NULL) == -1) err(EXIT_FAILURE, "Fail to acquire the reaper"); @@ -94,9 +95,8 @@ test(void) { if (waitpid(pid, NULL, 0) != pid) err(1, "waitpid()"); } -#if defined(DEBUG) - fprintf(stderr, "n = %d out of %d\n", n, m); -#endif + if (debug == 1) + fprintf(stderr, "n = %d out of %d\n", n, m); _exit(0); } diff --git a/tools/test/stress2/misc/reaper3.sh b/tools/test/stress2/misc/reaper3.sh index 90bb395da5c1..59012d2c45ca 100755 --- a/tools/test/stress2/misc/reaper3.sh +++ b/tools/test/stress2/misc/reaper3.sh @@ -59,14 +59,13 @@ flip(void *ap, size_t len) { unsigned char *cp; int byte; - unsigned char bit, buf, mask, old __unused; + unsigned char bit, buf, mask; cp = (unsigned char *)ap; byte = random_long(0, len); bit = random_long(0,7); mask = ~(1 << bit); buf = cp[byte]; - old = cp[byte]; buf = (buf & mask) | (~buf & ~mask); cp[byte] = buf; } @@ -86,8 +85,9 @@ test(void) { struct procctl_reaper_kill killemall; pid_t pid; time_t start; - int data[20], e, n __unused, m; + int data[20], debug, e, n, m; + debug = 0; /* set to 1 for debug output */ n = m = 0; if (procctl(P_PID, getpid(), PROC_REAP_ACQUIRE, NULL) == -1) err(EXIT_FAILURE, "Fail to acquire the reaper"); @@ -118,9 +118,8 @@ test(void) { if (waitpid(pid, NULL, 0) != pid) err(1, "waitpid()"); } -#if defined(DEBUG) - fprintf(stderr, "n = %d out of %d\n", n, m); -#endif + if (debug == 1) + fprintf(stderr, "n = %d out of %d\n", n, m); _exit(0); } diff --git a/tools/test/stress2/misc/reaper4.sh b/tools/test/stress2/misc/reaper4.sh index bd30bd1b0efd..0fdb3f75ccff 100755 --- a/tools/test/stress2/misc/reaper4.sh +++ b/tools/test/stress2/misc/reaper4.sh @@ -59,14 +59,13 @@ flip(void *ap, size_t len) { unsigned char *cp; int byte; - unsigned char bit, buf, mask, old __unused; + unsigned char bit, buf, mask; cp = (unsigned char *)ap; byte = random_long(0, len); bit = random_long(0,7); mask = ~(1 << bit); buf = cp[byte]; - old = cp[byte]; buf = (buf & mask) | (~buf & ~mask); cp[byte] = buf; } @@ -85,8 +84,9 @@ test(void) { struct procctl_reaper_kill killemall; pid_t pid; time_t start; - int data[20], e, n __unused, m; + int data[20], debug, e, n, m; + debug = 0; /* set to 1 for debug output */ n = m = 0; if (procctl(P_PID, getpid(), PROC_REAP_ACQUIRE, NULL) == -1) err(EXIT_FAILURE, "Fail to acquire the reaper"); @@ -117,9 +117,8 @@ test(void) { if (waitpid(pid, NULL, 0) != pid) err(1, "waitpid()"); } -#if defined(DEBUG) - fprintf(stderr, "n = %d out of %d\n", n, m); -#endif + if (debug == 1) + fprintf(stderr, "n = %d out of %d\n", n, m); _exit(0); }