Move all GUCs to private memory, PGC_POSTMASTER.

akorotkov · ildus · commit 3947ef587687 · 2015-10-20T16:20:58.000+03:00
diff --git a/contrib/pg_stat_wait/collector.c b/contrib/pg_stat_wait/collector.c
@@ -27,6 +27,10 @@ shm_toc *toc;
 shm_mq *mq;
 static volatile sig_atomic_t shutdown_requested = false;
 
+int         historySize;
+int         historyPeriod;
+bool        historySkipLatch;
+
 static void handle_sigterm(SIGNAL_ARGS);
 static void collector_main(Datum main_arg);
 
@@ -66,20 +70,6 @@ AllocateCollectorMem(void)
 
 		mq_mem = shm_toc_allocate(toc, COLLECTOR_QUEUE_SIZE);
 		shm_toc_insert(toc, 1, mq_mem);
-
-		DefineCustomIntVariable("pg_stat_wait.history_size",
-				"Sets size of waits history.", NULL,
-				&hdr->historySize, 5000, 100, INT_MAX,
-				PGC_SUSET, 0, NULL, NULL, NULL);
-
-		DefineCustomIntVariable("pg_stat_wait.history_period",
-				"Sets period of waits history sampling.", NULL,
-				&hdr->historyPeriod, 10, 1, INT_MAX,
-				PGC_SUSET, 0, NULL, NULL, NULL);
-
-		DefineCustomBoolVariable("pg_stat_wait.history_skip_latch",
-				"Skip latch events in waits history", NULL,
-				&hdr->historySkipLatch, false, PGC_SUSET, 0, NULL, NULL, NULL);
 	}
 	else
 	{
@@ -185,7 +175,7 @@ write_waits_history(History *observations, TimestampTz current_ts)
 
 		if (stateOk)
 		{
-			if (hdr->historySkipLatch && item.classId == WAIT_LATCH)
+			if (historySkipLatch && item.classId == WAIT_LATCH)
 				continue;
 
 			item.ts = current_ts;
@@ -241,7 +231,7 @@ collector_main(Datum main_arg)
 			ALLOCSET_DEFAULT_INITSIZE,
 			ALLOCSET_DEFAULT_MAXSIZE);
 	old_context = MemoryContextSwitchTo(collector_context);
-	AllocHistory(&observations, hdr->historySize);
+	AllocHistory(&observations, historySize);
 	MemoryContextSwitchTo(old_context);
 
 	while (1)
@@ -258,7 +248,7 @@ collector_main(Datum main_arg)
 
 		rc = WaitLatch(&MyProc->procLatch,
 			WL_LATCH_SET | WL_TIMEOUT | WL_POSTMASTER_DEATH,
-			hdr->historyPeriod);
+			historyPeriod);
 
 		if (rc & WL_POSTMASTER_DEATH)
 			exit(1);
diff --git a/contrib/pg_stat_wait/pg_stat_wait.c b/contrib/pg_stat_wait/pg_stat_wait.c
@@ -49,7 +49,21 @@ _PG_init(void)
 		return;
 
 	DefineCustomBoolVariable("pg_stat_wait.history", "Collect waits history",
-			NULL, &WaitsHistoryOn, false, PGC_SUSET, 0, NULL, NULL, NULL);
+			NULL, &WaitsHistoryOn, false, PGC_POSTMASTER, 0, NULL, NULL, NULL);
+
+	DefineCustomIntVariable("pg_stat_wait.history_size",
+			"Sets size of waits history.", NULL,
+			&historySize, 5000, 100, INT_MAX,
+			PGC_POSTMASTER, 0, NULL, NULL, NULL);
+
+	DefineCustomIntVariable("pg_stat_wait.history_period",
+			"Sets period of waits history sampling.", NULL,
+			&historyPeriod, 10, 1, INT_MAX,
+			PGC_POSTMASTER, 0, NULL, NULL, NULL);
+
+	DefineCustomBoolVariable("pg_stat_wait.history_skip_latch",
+			"Skip latch events in waits history", NULL,
+			&historySkipLatch, false, PGC_POSTMASTER, 0, NULL, NULL, NULL);
 
 	if (WaitsHistoryOn)
 	{
diff --git a/contrib/pg_stat_wait/pg_stat_wait.h b/contrib/pg_stat_wait/pg_stat_wait.h
@@ -62,16 +62,17 @@ typedef struct
 {
 	Latch       *latch;
 	SHMRequest  request;
-	int         historySize;
-	int         historyPeriod;
-	bool        historySkipLatch;
 } CollectorShmqHeader;
 
 extern PGDLLIMPORT char *WAIT_LOCK_NAMES[];
 extern PGDLLIMPORT char *WAIT_LWLOCK_NAMES[];
 extern PGDLLIMPORT char *WAIT_IO_NAMES[];
 extern PGDLLIMPORT char *WAIT_NETWORK_NAMES[];
 extern PGDLLIMPORT const int WAIT_OFFSETS[];
+extern PGDLLIMPORT int         historySize;
+extern PGDLLIMPORT int         historyPeriod;
+extern PGDLLIMPORT bool        historySkipLatch;
+
 
 Size CollectorShmemSize(void);
 void AllocateCollectorMem(void);
