From 1e5d6ed9b54c264d539c84ead7513845ad1349ed Mon Sep 17 00:00:00 2001 From: YANG Xudong Date: Wed, 17 May 2023 16:22:06 +0800 Subject: [PATCH 2/2] Make s_lock_test work. --- src/backend/storage/lmgr/Makefile | 2 +- src/backend/storage/lmgr/s_lock.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/backend/storage/lmgr/Makefile b/src/backend/storage/lmgr/Makefile index b25b7ee421..3b04561d6f 100644 --- a/src/backend/storage/lmgr/Makefile +++ b/src/backend/storage/lmgr/Makefile @@ -33,7 +33,7 @@ endif s_lock_test: s_lock.c $(top_builddir)/src/common/libpgcommon.a $(top_builddir)/src/port/libpgport.a $(CC) $(CPPFLAGS) $(CFLAGS) -DS_LOCK_TEST=1 $(srcdir)/s_lock.c \ $(TASPATH) -L $(top_builddir)/src/common -lpgcommon \ - -L $(top_builddir)/src/port -lpgport -o s_lock_test + -L $(top_builddir)/src/port -lpgport -lm -o s_lock_test # see notes in src/backend/parser/Makefile lwlocknames.c: lwlocknames.h diff --git a/src/backend/storage/lmgr/s_lock.c b/src/backend/storage/lmgr/s_lock.c index 327ac64f7c..1d674840b4 100644 --- a/src/backend/storage/lmgr/s_lock.c +++ b/src/backend/storage/lmgr/s_lock.c @@ -145,9 +145,13 @@ perform_spin_delay(SpinDelayStatus *status) * We might want to report something more granular at some point, but * this is better than nothing. */ +#if !defined(S_LOCK_TEST) pgstat_report_wait_start(WAIT_EVENT_SPIN_DELAY); +#endif pg_usleep(status->cur_delay); +#if !defined(S_LOCK_TEST) pgstat_report_wait_end(); +#endif #if defined(S_LOCK_TEST) fprintf(stdout, "*"); -- 2.40.1