From 7a2e2aff29157e6e1b64dee60456f14a1e294237 Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Fri, 12 Apr 2024 10:39:46 -0700 Subject: [PATCH v1 1/2] meson: Add target for s_lock_test s_lock_test can't currently be used for automated tests as a) it takes a while b) it doesn't report failures in a usable way but it is still useful to be able to build and run it manually. The addition of PGDLLIMPORT to my_wait_event info is necessary to get link the program correctly when targeting windows. Apparently that hadn't been tried before. TODO: Should we build this by default, so it doesn't accidentally break, like it has in the past? --- src/backend/storage/lmgr/meson.build | 13 +++++++++++++ src/backend/storage/lmgr/s_lock.c | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/backend/storage/lmgr/meson.build b/src/backend/storage/lmgr/meson.build index 05ac41e809a..26463d4e8a2 100644 --- a/src/backend/storage/lmgr/meson.build +++ b/src/backend/storage/lmgr/meson.build @@ -11,3 +11,16 @@ backend_sources += files( 's_lock.c', 'spin.c', ) + +# Test binary for spinlocks. This isn't run as a test as +# a) it takes a while +# b) it doesn't report failures in a usable way +# but it is still useful to be able to build and run it manually. +s_lock_test = executable('s_lock_test', + files('s_lock.c'), + dependencies: [backend_code], + link_with: [common_static, pgport_static], + kwargs: default_bin_args + {'install': false}, + c_args: ['-DS_LOCK_TEST=1'], + build_by_default: false, +) diff --git a/src/backend/storage/lmgr/s_lock.c b/src/backend/storage/lmgr/s_lock.c index 9b389d99512..f725d026317 100644 --- a/src/backend/storage/lmgr/s_lock.c +++ b/src/backend/storage/lmgr/s_lock.c @@ -67,7 +67,7 @@ * s_lock_test. */ static uint32 local_my_wait_event_info; -uint32 *my_wait_event_info = &local_my_wait_event_info; +PGDLLIMPORT uint32 *my_wait_event_info = &local_my_wait_event_info; #endif static int spins_per_delay = DEFAULT_SPINS_PER_DELAY; -- 2.44.0.279.g3bd955d269