From 0a208ed63ffe50a8d9d7c0b33996ec01cc4fdef6 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Fri, 13 Aug 2021 14:42:27 -0400 Subject: [PATCH] Un-break s_lock_test. Commit 80abbeba2 evidently didn't bother checking this code. Also, list the generated executable in .gitignore (so it's been a REALLY long time since anyone tried this). Noted while trying out RISC-V spinlock patch. Given that this has been broken for 5 years and nobody noticed, it's likely not worth back-patching. --- src/backend/storage/lmgr/.gitignore | 1 + src/backend/storage/lmgr/s_lock.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/backend/storage/lmgr/.gitignore b/src/backend/storage/lmgr/.gitignore index 9355caea8c1..dab4c3f5806 100644 --- a/src/backend/storage/lmgr/.gitignore +++ b/src/backend/storage/lmgr/.gitignore @@ -1,2 +1,3 @@ /lwlocknames.c /lwlocknames.h +/s_lock_test diff --git a/src/backend/storage/lmgr/s_lock.c b/src/backend/storage/lmgr/s_lock.c index 2dc2d671510..91322a40c1c 100644 --- a/src/backend/storage/lmgr/s_lock.c +++ b/src/backend/storage/lmgr/s_lock.c @@ -368,7 +368,7 @@ main() printf(" if S_LOCK() and TAS() are working.\n"); fflush(stdout); - s_lock(&test_lock.lock, __FILE__, __LINE__); + s_lock(&test_lock.lock, __FILE__, __LINE__, PG_FUNCNAME_MACRO); printf("S_LOCK_TEST: failed, lock not locked\n"); return 1; -- 2.39.5