From 0ce39702fc396075ee87f7063e775302fd6fb791 Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Tue, 7 Jan 2025 19:51:00 -0500 Subject: [PATCH v2 3/7] postmaster: Introduce variadic btmask_all_except() Upcoming patches would otherwise need btmask_all_except3(). Reviewed-by: Heikki Linnakangas Discussion: https://postgr.es/m/w3z6w3g4aovivs735nk4pzjhmegntecesm3kktpebchegm5o53@aonnq2kn27xi --- src/backend/postmaster/postmaster.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 51ec097cd43..f9d6c552341 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -164,23 +164,20 @@ btmask_del(BackendTypeMask mask, BackendType t) } static inline BackendTypeMask -btmask_all_except(BackendType t) +btmask_all_except_n(int nargs, BackendType *t) { BackendTypeMask mask = BTYPE_MASK_ALL; - mask = btmask_del(mask, t); + for (int i = 0; i < nargs; i++) + mask = btmask_del(mask, t[i]); return mask; } -static inline BackendTypeMask -btmask_all_except2(BackendType t1, BackendType t2) -{ - BackendTypeMask mask = BTYPE_MASK_ALL; - - mask = btmask_del(mask, t1); - mask = btmask_del(mask, t2); - return mask; -} +#define btmask_all_except(...) \ + btmask_all_except_n( \ + lengthof(((BackendType[]){__VA_ARGS__})), \ + (BackendType[]){__VA_ARGS__} \ + ) static inline bool btmask_contains(BackendTypeMask mask, BackendType t) @@ -2979,7 +2976,7 @@ PostmasterStateMachine(void) * left by now anyway; what we're really waiting for is walsenders and * archiver. */ - if (CountChildren(btmask_all_except2(B_LOGGER, B_DEAD_END_BACKEND)) == 0) + if (CountChildren(btmask_all_except(B_LOGGER, B_DEAD_END_BACKEND)) == 0) { UpdatePMState(PM_WAIT_DEAD_END); ConfigurePostmasterWaitSet(false); -- 2.45.2.746.g06e570c0df.dirty