From nobody Tue Jan 9 10:31:49 2024 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 4T8S0Q1Rb4z573RB; Tue, 9 Jan 2024 10:31:50 +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 4T8S0Q10KSz4XVH; Tue, 9 Jan 2024 10:31:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704796310; 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=A7FAwSBkj60VMMKIHbRI2S3WUr6Bt138eDrkMLWmol8=; b=ktyIO7qL9NPAK+mRPvUmmeDrPfEuRJQCQvMIJ3QDDLr0YaeITLE8Rjc4Yn8GFLKkYKd4uh tnYf5QhmknP4rQw8Z4R2vrBOZw8IhjHXWL9o0M+ZX1lf84FSzRAYNTABleghq7OvWB4Q/e UWerlnqOftW4hFpVKLLltjsOH0P+pX2dwPzvcHT4IIbT8bdiE9nxnX0td9wnxcNIkTeWnA af3AlicgiDIFiCDSxtcE+j5LVscasoBMLW0e17BDhJm3Wh3jxOkaifZ0kqlTCGT3rwkqWx rbq8ON+TlloGP1Vfpvj/KODGizYjeP/QC46CGCQ0WBf/gGzfpdg9evmKAcQHbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704796310; 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=A7FAwSBkj60VMMKIHbRI2S3WUr6Bt138eDrkMLWmol8=; b=V8NaFQJqgLuN5oONUBQI64bi+nkjpSZAGIWYmeHqn+A7KLxA83yFj22094k1/Py6dqo5bi XC2QOGs8XwpfahJwxxmp0DOBbcxSItD41lTRg0uSl2sy5LXcJdhtBwvhGuGnkqVMBOsI82 3Kjo0JxKbd9r6Fa/15er3LRHHKYV1qP/tLstK2YYUiVIHfGMaAHUhdeL1UVtItUnFdt6sJ ijTnN7F0etR6anU5dTs4soEj4evcV1YLTIwZFGVu7SMYwr/vrVPNR80xfUXCvGwOkOm+tx hoZzebHdb/fg3ifMcv+tKU23tQhQXSbNWFrOOUduDX/1VW0XL7DzJh0bH14kIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704796310; a=rsa-sha256; cv=none; b=OPR1/3V5C2MSHFG2DXloQ0sh46G1d1TFjxdbM54YXQ8xp11cgaHsdpfPSnX4PLA1mcPtkN lcDVwPyzKjWyps3VDXyfU5ZOmnb1sIqRqSZKBKq6NjxTZ8OYhtmeA4ViXB3n17xvmXMrOk vI5gyhbbNFt3SRZ2JGC3M0VYPHbOM5QfOD1OmOkFmgBeWqzkE3tPLp+dFycFtJNE1XQnOv j2xaCAYRGKfc5rOj+21QwbP6nrk8RwS7VQWR1DL3GfBJeDLmGZc8ZrijPfBOsQrXMpTlpS aimacZuJ+ofTe85QkqTMpgeM4jAlvT9UlL2YvSTPL5c1gWZ61J5/OuR1pnmaWw== 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 4T8S0Q05PJznK5; Tue, 9 Jan 2024 10:31:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 409AVnwc036130; Tue, 9 Jan 2024 10:31:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 409AVn10036127; Tue, 9 Jan 2024 10:31:49 GMT (envelope-from git) Date: Tue, 9 Jan 2024 10:31:49 GMT Message-Id: <202401091031.409AVn10036127@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: f1bc2f67a3e0 - main - stress2: Reduce idle time. Remove debug output 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: f1bc2f67a3e0dd5120c3345c11bd3205b4348b8a Auto-Submitted: auto-generated The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=f1bc2f67a3e0dd5120c3345c11bd3205b4348b8a commit f1bc2f67a3e0dd5120c3345c11bd3205b4348b8a Author: Peter Holm AuthorDate: 2024-01-09 10:28:26 +0000 Commit: Peter Holm CommitDate: 2024-01-09 10:28:26 +0000 stress2: Reduce idle time. Remove debug output --- tools/test/stress2/misc/mmap10.sh | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/tools/test/stress2/misc/mmap10.sh b/tools/test/stress2/misc/mmap10.sh index a29768c36691..0bb7845f4d15 100755 --- a/tools/test/stress2/misc/mmap10.sh +++ b/tools/test/stress2/misc/mmap10.sh @@ -40,18 +40,22 @@ sed '1,/^EOF/d' < $here/$0 > mmap10.c mycc -o mmap10 -Wall -Wextra -O2 -g mmap10.c -lpthread || exit 1 rm -f mmap10.c -daemon sh -c "(cd $here/../testcases/swap; ./swap -t 2m -i 20 -k)" +daemon sh -c "(cd $here/../testcases/swap; ./swap -t 2m -i 20 -k > /dev/null)" +ulimit -c 0 sleep `jot -r 1 0 9` for i in `jot 2`; do - /tmp/mmap10 & + su $testuser -c /tmp/mmap10 & done -sleep 300 +start=`date +%s` while pgrep -q mmap10; do - pkill -9 mmap10 + [ $((`date +%s` - start)) -ge 300 ] && break + sleep 2 +done +while pgrep -q 'mmap10|swap'; do + pkill -9 mmap10 swap sleep 2 done wait -killall -q swap rm -f /tmp/mmap10 /tmp/mmap10.core exit 0 @@ -76,6 +80,7 @@ EOF #define N (128 * 1024 / (int)sizeof(u_int32_t)) #define PARALLEL 50 +static int debug = 0; /* set to "1" for debug output */ void *p; u_int32_t r[N]; @@ -169,7 +174,7 @@ tmlock(void *arg __unused) if (munlock(makeptr(), len) == 0) n++; } - if (n < 10) + if (debug == 1 && n < 10) fprintf(stderr, "Note: tmlock() only succeeded %d times.\n", n); @@ -193,7 +198,7 @@ tmprotect(void *arg __unused) n++; usleep(1000); } - if (n < 10) + if (debug == 1 && n < 10) fprintf(stderr, "Note: tmprotect() only succeeded %d times.\n", n); @@ -215,7 +220,7 @@ tmlockall(void *arg __unused) munlockall(); usleep(1000); } - if (n < 10) + if (debug == 1 && n < 10) fprintf(stderr, "Note: tmlockall() only succeeded %d times.\n", n);