From 8648b1549eabd62725f0013825667fb5d00ec453 Mon Sep 17 00:00:00 2001 From: Thomas Munro Date: Wed, 31 Jul 2024 17:17:36 +1200 Subject: [PATCH 2/2] Remove SpinLockFree(). This interface has been unused for a long time, except in a test that is now gone. --- src/include/storage/s_lock.h | 5 ----- src/include/storage/spin.h | 6 ------ 2 files changed, 11 deletions(-) diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h index 40e2d62ef38..b0fcfce16cf 100644 --- a/src/include/storage/s_lock.h +++ b/src/include/storage/s_lock.h @@ -22,10 +22,6 @@ * void S_UNLOCK(slock_t *lock) * Unlock a previously acquired lock. * - * bool S_LOCK_FREE(slock_t *lock) - * Tests if the lock is free. Returns true if free, false if locked. - * This does *not* change the state of the lock. - * * void SPIN_DELAY(void) * Delay operation to occur inside spinlock wait loop. * @@ -51,7 +47,6 @@ typedef pg_atomic_flag slock_t; #define S_INIT_LOCK(lock) pg_atomic_init_flag(lock) #define S_LOCK(lock) (pg_atomic_test_set_flag(lock) ? 0 : s_lock((lock), __FILE__, __LINE__, __func__)) #define S_UNLOCK(lock) pg_atomic_clear_flag(lock) -#define S_LOCK_FREE(lock) (pg_atomic_unlocked_test_flag(lock)) #define SPIN_DELAY() pg_spin_delay() /* diff --git a/src/include/storage/spin.h b/src/include/storage/spin.h index 3ae2a56d073..d4dea2a98ff 100644 --- a/src/include/storage/spin.h +++ b/src/include/storage/spin.h @@ -18,10 +18,6 @@ * void SpinLockRelease(volatile slock_t *lock) * Unlock a previously acquired lock. * - * bool SpinLockFree(slock_t *lock) - * Tests if the lock is free. Returns true if free, false if locked. - * This does *not* change the state of the lock. - * * Callers must beware that the macro argument may be evaluated multiple * times! * @@ -60,6 +56,4 @@ #define SpinLockRelease(lock) S_UNLOCK(lock) -#define SpinLockFree(lock) S_LOCK_FREE(lock) - #endif /* SPIN_H */ -- 2.45.2