From 46778187f5373f6072b58d5e4c298b775333a37c Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Thu, 25 Jan 2024 11:13:38 +0100 Subject: [PATCH] Fix s_lock_test compile This is a mostly unused tool, but I discovered while nosing around the Makefile that it hasn't been kept in line with other changes. Fix it. Backpatching doesn't appear to be necessary. Discussion: https://postgr.es/m/202401241114.ied53jcich72@alvherre.pgsql --- src/backend/storage/lmgr/Makefile | 2 +- src/backend/storage/lmgr/s_lock.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/backend/storage/lmgr/Makefile b/src/backend/storage/lmgr/Makefile index 504480e847..1aef423384 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 0e5f7ab0b9..8437b13073 100644 --- a/src/backend/storage/lmgr/s_lock.c +++ b/src/backend/storage/lmgr/s_lock.c @@ -61,6 +61,14 @@ #define MIN_DELAY_USEC 1000L #define MAX_DELAY_USEC 1000000L +#ifdef S_LOCK_TEST +/* + * These are needed by pgstat_report_wait_start in the standalone compile of + * s_lock_test. + */ +static uint32 local_my_wait_event_info; +uint32 *my_wait_event_info = &local_my_wait_event_info; +#endif slock_t dummy_spinlock; -- 2.11.4.GIT