From nobody Fri Aug 30 08:05:35 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 4Ww9gh0CLRz5TJcr; Fri, 30 Aug 2024 08:05:36 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ww9gg6Yvwz4Ppk; Fri, 30 Aug 2024 08:05:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725005135; 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=mTiUuKFw+/EZPwIXg2/xgpzZrkyeUiXj9GM+DbzCfOc=; b=FtI+w38CByN4IgWqdWjGS81TgPPUGdQMXF3xZDzbDc2YXo+jgyZRvU+cElrmu4sMFFCSO8 7ipBBtQfY1YonNUatDJKGgmesJu0tJXIE2dirQZ/a5XiOOVVeFzg/uoTbsNfRzcCmuS0RF BgI/7DJ/wync7YCReNIYuymp8kCuQVgdSNmdNla8IaUyAb59n20bcKYWByuCWkClqIlLCw WSawOUIHPhH6+FQVu8wiLnbs46Xb5pc8qGv6e7cU4dzRaJe/CdRcK61Z9hJus9P82qWLMX beaYEXBxV/ZJVA/cCwtCwkJGVUfD18Z0QB03zP+ck0MLgL1LFhyRFEXjmXeuHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725005135; a=rsa-sha256; cv=none; b=xdjZBM56dzFo3Kk3cmmRynOm03Pscjub0+7vfW/TRUH9XYQU+PBMBryRyVAnBn/teI487q NjeNd/Y3+mm84t6wSWwqkTfO4f46cW05g1qH2hH45YmrRPTJ5fZOadC0DZoBPaQAgQfbR8 5Vr/gs25e+6qIeKyljJK/rFTUJgV0JLmjtzxfRjD+DDldbVEwvBqIt+c18A5HwBTcnPop5 uybXCiguPqraYpdCnxZaocRFS0a867P+OioLdixJm8ArqtFyr85oUh2qnCHa9IF4K0rDPY pubSedY8855QrMo7ZetnEJCj9eOl2bADMXcG1TPxrtqm1caQAP20n76PrHdG5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725005135; 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=mTiUuKFw+/EZPwIXg2/xgpzZrkyeUiXj9GM+DbzCfOc=; b=dETm/N+sdhSTVDybLwilcQEJHRyJQwhjpSGj/ig85o9whAzb7F40/O8NstLcyklxUEEt3x tCZOWt0QCKVDvgMUd4m118pWhm5WqUXNJsOEKE9m8ctxkaywh/uFrFmlWIXSWQaS9RRJJV wrM90HpbOaIxYLL3xZ2z6gpo8tmkPjXrFOH8sh5mUEc2SFjCGgc5Mb2qeyW8wMtxvxynIO RRlrkbal9GcpNzEX4lrikZaID/lSWDnQhyoPxAwHZ5H2eE4UNrVZ/hD6sUiHIjGkE8CJ/t i3yNZMkF+oTZar+64F5zTAa8Ic5yQvQE+X4qxhfQb3ZnuindUaT8XhLG40TJEg== 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 4Ww9gg69Cqzsqx; Fri, 30 Aug 2024 08:05:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47U85ZMt012880; Fri, 30 Aug 2024 08:05:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47U85Ziq012877; Fri, 30 Aug 2024 08:05:35 GMT (envelope-from git) Date: Fri, 30 Aug 2024 08:05:35 GMT Message-Id: <202408300805.47U85Ziq012877@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: f6fd5af80a37 - main - stress2: Do not wait forever for swap usage 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: f6fd5af80a37ef0560959bd55c2c86d17ee2033f Auto-Submitted: auto-generated The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=f6fd5af80a37ef0560959bd55c2c86d17ee2033f commit f6fd5af80a37ef0560959bd55c2c86d17ee2033f Author: Peter Holm AuthorDate: 2024-08-30 08:04:46 +0000 Commit: Peter Holm CommitDate: 2024-08-30 08:04:46 +0000 stress2: Do not wait forever for swap usage --- tools/test/stress2/misc/mmap40.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/test/stress2/misc/mmap40.sh b/tools/test/stress2/misc/mmap40.sh index 7f4d07885e05..2314596e2f5d 100755 --- a/tools/test/stress2/misc/mmap40.sh +++ b/tools/test/stress2/misc/mmap40.sh @@ -53,13 +53,14 @@ mount /dev/md$mdstart $mntpoint set +e u1=`swapinfo | tail -1 | awk '{print $3}'` -(nice $odir/../testcases/swap/swap -t 10m -i 30 -h -l 100) & -while [ $((`swapinfo | tail -1 | awk '{print $3}'` - $u1)) -le 100 ]; do +(nice $odir/../testcases/swap/swap -t 10m -i 30 -h -l 100) > /dev/null & +for i in `jot 120`; do + u2=`swapinfo | tail -1 | awk '{print $3}'` + [ $u2 -lt $u1 ] && u1=$u2 + [ $((u2 - $u1)) -gt 100 ] && break sleep 1 done - -$dir/mmap40 -s=0 +/usr/bin/timeout 10m $dir/mmap40; s=$? while pkill swap; do :; done wait [ -f mmap40.core -a $s -eq 0 ] &&