Date: Wed, 06 May 2026 05:38:10 +0000 From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav <des@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 5158575d924b - stable/14 - lockf: Test that lockf does not spin on fd Message-ID: <69fad3c2.393f1.1f2b8c40@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=5158575d924b911aff759af62de642ed38a7a2b3 commit 5158575d924b911aff759af62de642ed38a7a2b3 Author: Dag-Erling Smørgrav <des@FreeBSD.org> AuthorDate: 2026-05-03 15:35:15 +0000 Commit: Dag-Erling Smørgrav <des@FreeBSD.org> CommitDate: 2026-05-06 05:37:40 +0000 lockf: Test that lockf does not spin on fd PR: 294832 MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D56723 (cherry picked from commit 0733afdb4dad58cfe7ad7f5994e26bf148d78199) --- usr.bin/lockf/tests/lockf_test.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/usr.bin/lockf/tests/lockf_test.sh b/usr.bin/lockf/tests/lockf_test.sh index d73c7590653d..22f0c206fa2a 100644 --- a/usr.bin/lockf/tests/lockf_test.sh +++ b/usr.bin/lockf/tests/lockf_test.sh @@ -152,6 +152,23 @@ fdlock_body() atf_check test "$status2" -eq 0 } +atf_test_case fdlockspin +fdlockspin_head() +{ + atf_set "descr" "Don't spin when locking a file descriptor" +} +fdlockspin_body() +{ + # Start background locker and give it time to get settled + lockf foo sleep 2 & sleep 1 + # Start foreground locker in fdlock mode + atf_check ktrace -tc lockf -t 3 0 <foo + # Background locker quit and foreground locker succeeded + atf_check -o save:trace kdump -tc + # Check how many times foreground locker called flock() + atf_check -o inline:"2\n" egrep -c 'CALL +flock' trace +} + atf_test_case keep keep_body() { @@ -234,6 +251,7 @@ atf_init_test_cases() atf_add_test_case badargs atf_add_test_case basic atf_add_test_case fdlock + atf_add_test_case fdlockspin atf_add_test_case keep atf_add_test_case needfile atf_add_test_case timeouthome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69fad3c2.393f1.1f2b8c40>