From 11fed833b3ed6d5c96957de5addc4f903b2cee6c Mon Sep 17 00:00:00 2001 From: Cory Fields Date: Mon, 19 May 2025 21:51:30 +0000 Subject: [PATCH] threading: add LOCK_ARGS macro This is useful for initializing locks in a constructor. --- src/sync.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/sync.h b/src/sync.h index b22956ef1ab..b71d5ef97a4 100644 --- a/src/sync.h +++ b/src/sync.h @@ -258,8 +258,9 @@ inline MutexType* MaybeCheckNotHeld(MutexType* m) LOCKS_EXCLUDED(m) LOCK_RETURNE #define LOCK2(cs1, cs2) \ UniqueLock criticalblock1(MaybeCheckNotHeld(cs1), #cs1, __FILE__, __LINE__); \ UniqueLock criticalblock2(MaybeCheckNotHeld(cs2), #cs2, __FILE__, __LINE__) -#define TRY_LOCK(cs, name) UniqueLock name(MaybeCheckNotHeld(cs), #cs, __FILE__, __LINE__, true) -#define WAIT_LOCK(cs, name) UniqueLock name(MaybeCheckNotHeld(cs), #cs, __FILE__, __LINE__) +#define LOCK_ARGS(cs) MaybeCheckNotHeld(cs), #cs, __FILE__, __LINE__ +#define TRY_LOCK(cs, name) UniqueLock name(LOCK_ARGS(cs), true) +#define WAIT_LOCK(cs, name) UniqueLock name(LOCK_ARGS(cs)) #define ENTER_CRITICAL_SECTION(cs) \ { \