Refector CFS intialization

knizhnik · knizhnik · commit 4b609bdb22d8 · 2017-04-05T19:26:21.000+03:00
diff --git a/src/backend/storage/file/cfs.c b/src/backend/storage/file/cfs.c
@@ -389,23 +389,31 @@ void cfs_decrypt(const char* fname, void* block, uint32 offs, uint32 size)
  *	Section 3: Compression implementation.
  * ----------------------------------------------------------------
  */
-void cfs_initialize()
+int cfs_shmem_size()
 {
-	cfs_state = (CfsState*)ShmemAlloc(sizeof(CfsState));
-	memset(&cfs_state->gc_stat, 0, sizeof cfs_state->gc_stat);
-	pg_atomic_init_flag(&cfs_state->gc_started);
-	pg_atomic_init_u32(&cfs_state->n_active_gc, 0);
-	cfs_state->n_workers = 0;
-	cfs_state->gc_enabled = cfs_gc_enabled;
-	cfs_state->max_iterations = 0;
-	
-	if (cfs_encryption)
-		cfs_crypto_init();
-
-	elog(LOG, "Start CFS version %s compression algorithm %s encryption %s", 
-		 CFS_VERSION, cfs_algorithm(), cfs_encryption ? "enabled" : "disabled");
+	return sizeof(CfsState);
 }
 
+void cfs_initialize()
+{
+	bool found;
+	cfs_state = (CfsState*)ShmemInitStruct("CFS Control", sizeof(CfsState), &found);
+	if (!found)
+	{
+		memset(&cfs_state->gc_stat, 0, sizeof cfs_state->gc_stat);
+		pg_atomic_init_flag(&cfs_state->gc_started);
+		pg_atomic_init_u32(&cfs_state->n_active_gc, 0);
+		cfs_state->n_workers = 0;
+		cfs_state->gc_enabled = cfs_gc_enabled;
+		cfs_state->max_iterations = 0;
+		
+		if (cfs_encryption)
+			cfs_crypto_init();
+		
+		elog(LOG, "Start CFS version %s compression algorithm %s encryption %s GC %s", 
+			 CFS_VERSION, cfs_algorithm(), cfs_encryption ? "enabled" : "disabled", cfs_gc_enabled ? "enabled" : "disabled");
+	}
+}
 int cfs_msync(FileMap* map)
 {
 #ifdef WIN32
@@ -566,7 +574,7 @@ void cfs_lock_file(FileMap* map, char const* file_path)
 				char* map_bck_path = psprintf("%s.cfm.bck", file_path);
 				char* file_bck_path = psprintf("%s.bck", file_path);
 				
-				elog(WARNING, "CFS indicates that GC of %s was interrupted: try to perform recovery", file_path);
+				elog(WARNING, "CFS indicates that GC of %s was interrupted: trying to perform recovery", file_path);
 				
 				if (access(file_bck_path, R_OK) != 0)
 				{
diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c
@@ -44,6 +44,7 @@
 #include "storage/procsignal.h"
 #include "storage/sinvaladt.h"
 #include "storage/spin.h"
+#include "storage/cfs.h"
 #include "utils/snapmgr.h"
 
 
@@ -142,6 +143,7 @@ CreateSharedMemoryAndSemaphores(bool makePrivate, int port)
 		size = add_size(size, BTreeShmemSize());
 		size = add_size(size, SyncScanShmemSize());
 		size = add_size(size, AsyncShmemSize());
+		size = add_size(size, cfs_shmem_size());
 #ifdef EXEC_BACKEND
 		size = add_size(size, ShmemBackendArraySize());
 #endif
@@ -254,7 +256,8 @@ CreateSharedMemoryAndSemaphores(bool makePrivate, int port)
 	BTreeShmemInit();
 	SyncScanShmemInit();
 	AsyncShmemInit();
-
+	cfs_initialize();
+	
 	/*
 	 * Init array of Latches  in SHMEM for WAITLSN
 	 */
diff --git a/src/backend/storage/lmgr/lwlocknames.txt b/src/backend/storage/lmgr/lwlocknames.txt
@@ -47,3 +47,4 @@ CommitTsLock						39
 ReplicationOriginLock				40
 MultiXactTruncationLock				41
 OldSnapshotTimeMapLock				42
+CfsGcLock                           43
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
@@ -10859,12 +10859,14 @@ static void set_cfs_gc_enabled(bool newval, void* extra)
 {
 	cfs_gc_enabled = newval;
 	if (cfs_state && MyProcPid == PostmasterPid) 
-		cfs_control_gc(newval);
+	{
+		cfs_state->gc_enabled = newval;
+	}
 }
 
 static char const* show_cfs_gc_enabled(void)
 {
-	return cfs_gc_enabled ? "on" : "off";
+	return (cfs_state ? cfs_state->gc_enabled : cfs_gc_enabled) ? "on" : "off";
 }
 
 
diff --git a/src/include/storage/cfs.h b/src/include/storage/cfs.h
@@ -119,6 +119,7 @@ int      cfs_msync(FileMap* map);
 FileMap* cfs_mmap(int md);
 int      cfs_munmap(FileMap* map);
 void     cfs_initialize(void);
+int      cfs_shmem_size(void);
 
 void     cfs_encrypt(const char* fname, void* block, uint32 offs, uint32 size);
 void     cfs_decrypt(const char* fname, void* block, uint32 offs, uint32 size);

Original file line number	Diff line number	Diff line change
`@@ -10859,12 +10859,14 @@ static void set_cfs_gc_enabled(bool newval, void* extra)`
`10859`	`10859`	`{`
`10860`	`10860`	`cfs_gc_enabled = newval;`
`10861`	`10861`	`if (cfs_state && MyProcPid == PostmasterPid)`
`10862`		`- cfs_control_gc(newval);`
	`10862`	`+ {`
	`10863`	`+ cfs_state->gc_enabled = newval;`
	`10864`	`+ }`
`10863`	`10865`	`}`
`10864`	`10866`
`10865`	`10867`	`static char const* show_cfs_gc_enabled(void)`
`10866`	`10868`	`{`
`10867`		`- return cfs_gc_enabled ? "on" : "off";`
	`10869`	`+ return (cfs_state ? cfs_state->gc_enabled : cfs_gc_enabled) ? "on" : "off";`
`10868`	`10870`	`}`
`10869`	`10871`
`10870`	`10872`