Commit7e957cb

committed

postmaster: Introduce variadic btmask_all_except()

Upcoming patches would otherwise need btmask_all_except3().Reviewed-by: Heikki Linnakangas <hlinnaka@iki.fi>Discussion:https://postgr.es/m/w3z6w3g4aovivs735nk4pzjhmegntecesm3kktpebchegm5o53@aonnq2kn27xi

1 parent40d4031 commit7e957cbCopy full SHA for 7e957cb

File tree

-12

lines changed

-12

lines changed

Lines changed: 9 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -164,23 +164,20 @@ btmask_del(BackendTypeMask mask, BackendType t)`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`staticinlineBackendTypeMask`
`167`		`-btmask_all_except(BackendTypet)`
	`167`	`+btmask_all_except_n(intnargs,BackendType*t)`
`168`	`168`	`{`
`169`	`169`	`BackendTypeMaskmask=BTYPE_MASK_ALL;`
`170`	`170`
`171`		`-mask=btmask_del(mask,t);`
	`171`	`+for (inti=0;i<nargs;i++)`
	`172`	`+mask=btmask_del(mask,t[i]);`
`172`	`173`	`returnmask;`
`173`	`174`	`}`
`174`	`175`
`175`		`-staticinlineBackendTypeMask`
`176`		`-btmask_all_except2(BackendTypet1,BackendTypet2)`
`177`		`-{`
`178`		`-BackendTypeMaskmask=BTYPE_MASK_ALL;`
`179`		`-`
`180`		`-mask=btmask_del(mask,t1);`
`181`		`-mask=btmask_del(mask,t2);`
`182`		`-returnmask;`
`183`		`-}`
	`176`	`+#definebtmask_all_except(...) \`
	`177`	`+btmask_all_except_n( \`
	`178`	`+lengthof(((BackendType[]){__VA_ARGS__})), \`
	`179`	`+(BackendType[]){__VA_ARGS__} \`
	`180`	`+)`
`184`	`181`
`185`	`182`	`staticinlinebool`
`186`	`183`	`btmask_contains(BackendTypeMaskmask,BackendTypet)`
`@@ -2979,7 +2976,7 @@ PostmasterStateMachine(void)`
`2979`	`2976`	`* left by now anyway; what we're really waiting for is walsenders and`
`2980`	`2977`	`* archiver.`
`2981`	`2978`	`*/`
`2982`		`-if (CountChildren(btmask_all_except2(B_LOGGER,B_DEAD_END_BACKEND))==0)`
	`2979`	`+if (CountChildren(btmask_all_except(B_LOGGER,B_DEAD_END_BACKEND))==0)`
`2983`	`2980`	`{`
`2984`	`2981`	`UpdatePMState(PM_WAIT_DEAD_END);`
`2985`	`2982`	`ConfigurePostmasterWaitSet(false);`

Comments

(0)