cfs: set CFS_GC_LOCK to be dependent on MAX_BACKENDS

Sokolov Yura · Sokolov Yura · commit 8bd21f55ca35 · 2017-06-26T16:32:18.000+03:00
diff --git a/src/backend/storage/file/cfs.c b/src/backend/storage/file/cfs.c
@@ -45,6 +45,8 @@
 #include "port/atomics.h"
 #include "pgstat.h"
 #include "portability/mem.h"
+#include "postmaster/bgworker.h"
+#include "postmaster/postmaster.h"
 #include "storage/fd.h"
 #include "storage/cfs.h"
 #include "storage/ipc.h"
@@ -53,7 +55,6 @@
 #include "utils/rel.h"
 #include "utils/builtins.h"
 #include "utils/resowner_private.h"
-#include "postmaster/bgworker.h"
 
 
 /*
@@ -398,6 +399,12 @@ int cfs_shmem_size()
 void cfs_initialize()
 {
 	bool found;
+
+	StaticAssertStmt((CFS_GC_LOCK & (CFS_GC_LOCK-1)) == 0,
+			"CFS_GC_LOCK should be single bit");
+	StaticAssertStmt(CFS_GC_LOCK > MAX_BACKENDS,
+			"CFS_GC_LOCK should be larger than MAX_BACKENDS");
+
 	cfs_state = (CfsState*)ShmemInitStruct("CFS Control",
 			sizeof(CfsState) + sizeof(pg_atomic_uint32)*MaxBackends, &found);
 	if (!found)
diff --git a/src/include/storage/cfs.h b/src/include/storage/cfs.h
@@ -8,7 +8,7 @@
 
 #define CFS_VERSION "0.45"
 
-#define CFS_GC_LOCK  0x10000000
+#define CFS_GC_LOCK  (MAX_BACKENDS+1)
 
 #define CFS_LOCK_MIN_TIMEOUT 100    /* microseconds: initial timeout of GC lock acquisition */
 #define CFS_LOCK_MAX_TIMEOUT 10000  /* microseconds */
