postgres
diff --git a/‎src/backend/utils/activity/pgstat.c
Lines changed: 6 additions & 0 deletions b/‎src/backend/utils/activity/pgstat.c
Lines changed: 6 additions & 0 deletions
diff --git a/‎src/backend/utils/activity/pgstat_archiver.c
Lines changed: 8 additions & 0 deletions b/‎src/backend/utils/activity/pgstat_archiver.c
Lines changed: 8 additions & 0 deletions
diff --git a/‎src/backend/utils/activity/pgstat_bgwriter.c
Lines changed: 8 additions & 0 deletions b/‎src/backend/utils/activity/pgstat_bgwriter.c
Lines changed: 8 additions & 0 deletions
diff --git a/‎src/backend/utils/activity/pgstat_checkpointer.c
Lines changed: 8 additions & 0 deletions b/‎src/backend/utils/activity/pgstat_checkpointer.c
Lines changed: 8 additions & 0 deletions
diff --git a/‎src/backend/utils/activity/pgstat_io.c
Lines changed: 9 additions & 0 deletions b/‎src/backend/utils/activity/pgstat_io.c
Lines changed: 9 additions & 0 deletions
diff --git a/‎src/backend/utils/activity/pgstat_shmem.c
Lines changed: 11 additions & 10 deletions b/‎src/backend/utils/activity/pgstat_shmem.c
Lines changed: 11 additions & 10 deletions
diff --git a/‎src/backend/utils/activity/pgstat_slru.c
Lines changed: 8 additions & 0 deletions b/‎src/backend/utils/activity/pgstat_slru.c
Lines changed: 8 additions & 0 deletions
diff --git a/‎src/backend/utils/activity/pgstat_wal.c
Lines changed: 8 additions & 0 deletions b/‎src/backend/utils/activity/pgstat_wal.c
Lines changed: 8 additions & 0 deletions
diff --git a/‎src/include/utils/pgstat_internal.h
Lines changed: 13 additions & 0 deletions b/‎src/include/utils/pgstat_internal.h
Lines changed: 13 additions & 0 deletions
@@ -354,6 +354,7 @@ static const PgStat_KindInfo pgstat_kind_infos[PGSTAT_NUM_KINDS] = {
 		.shared_data_off = offsetof(PgStatShared_Archiver, stats),
 		.shared_data_len = sizeof(((PgStatShared_Archiver *) 0)->stats),
 
+		.init_shmem_cb = pgstat_archiver_init_shmem_cb,
 		.reset_all_cb = pgstat_archiver_reset_all_cb,
 		.snapshot_cb = pgstat_archiver_snapshot_cb,
 	},
@@ -368,6 +369,7 @@ static const PgStat_KindInfo pgstat_kind_infos[PGSTAT_NUM_KINDS] = {
 		.shared_data_off = offsetof(PgStatShared_BgWriter, stats),
 		.shared_data_len = sizeof(((PgStatShared_BgWriter *) 0)->stats),
 
+		.init_shmem_cb = pgstat_bgwriter_init_shmem_cb,
 		.reset_all_cb = pgstat_bgwriter_reset_all_cb,
 		.snapshot_cb = pgstat_bgwriter_snapshot_cb,
 	},
@@ -382,6 +384,7 @@ static const PgStat_KindInfo pgstat_kind_infos[PGSTAT_NUM_KINDS] = {
 		.shared_data_off = offsetof(PgStatShared_Checkpointer, stats),
 		.shared_data_len = sizeof(((PgStatShared_Checkpointer *) 0)->stats),
 
+		.init_shmem_cb = pgstat_checkpointer_init_shmem_cb,
 		.reset_all_cb = pgstat_checkpointer_reset_all_cb,
 		.snapshot_cb = pgstat_checkpointer_snapshot_cb,
 	},
@@ -396,6 +399,7 @@ static const PgStat_KindInfo pgstat_kind_infos[PGSTAT_NUM_KINDS] = {
 		.shared_data_off = offsetof(PgStatShared_IO, stats),
 		.shared_data_len = sizeof(((PgStatShared_IO *) 0)->stats),
 
+		.init_shmem_cb = pgstat_io_init_shmem_cb,
 		.reset_all_cb = pgstat_io_reset_all_cb,
 		.snapshot_cb = pgstat_io_snapshot_cb,
 	},
@@ -410,6 +414,7 @@ static const PgStat_KindInfo pgstat_kind_infos[PGSTAT_NUM_KINDS] = {
 		.shared_data_off = offsetof(PgStatShared_SLRU, stats),
 		.shared_data_len = sizeof(((PgStatShared_SLRU *) 0)->stats),
 
+		.init_shmem_cb = pgstat_slru_init_shmem_cb,
 		.reset_all_cb = pgstat_slru_reset_all_cb,
 		.snapshot_cb = pgstat_slru_snapshot_cb,
 	},
@@ -424,6 +429,7 @@ static const PgStat_KindInfo pgstat_kind_infos[PGSTAT_NUM_KINDS] = {
 		.shared_data_off = offsetof(PgStatShared_Wal, stats),
 		.shared_data_len = sizeof(((PgStatShared_Wal *) 0)->stats),
 
+		.init_shmem_cb = pgstat_wal_init_shmem_cb,
 		.reset_all_cb = pgstat_wal_reset_all_cb,
 		.snapshot_cb = pgstat_wal_snapshot_cb,
 	},
 
@@ -62,6 +62,14 @@ pgstat_fetch_stat_archiver(void)
 }
 
+void
+pgstat_archiver_init_shmem_cb(void *stats)
+{
+	PgStatShared_Archiver *stats_shmem = (PgStatShared_Archiver *) stats;
+
+	LWLockInitialize(&stats_shmem->lock, LWTRANCHE_PGSTATS_DATA);
+}
+
 void
 pgstat_archiver_reset_all_cb(TimestampTz ts)
 {
 
@@ -75,6 +75,14 @@ pgstat_fetch_stat_bgwriter(void)
 	return &pgStatLocal.snapshot.bgwriter;
 }
 
+void
+pgstat_bgwriter_init_shmem_cb(void *stats)
+{
+	PgStatShared_BgWriter *stats_shmem = (PgStatShared_BgWriter *) stats;
+
+	LWLockInitialize(&stats_shmem->lock, LWTRANCHE_PGSTATS_DATA);
+}
+
 void
 pgstat_bgwriter_reset_all_cb(TimestampTz ts)
 {
 
@@ -84,6 +84,14 @@ pgstat_fetch_stat_checkpointer(void)
 	return &pgStatLocal.snapshot.checkpointer;
 }
 
+void
+pgstat_checkpointer_init_shmem_cb(void *stats)
+{
+	PgStatShared_Checkpointer *stats_shmem = (PgStatShared_Checkpointer *) stats;
+
+	LWLockInitialize(&stats_shmem->lock, LWTRANCHE_PGSTATS_DATA);
+}
+
 void
 pgstat_checkpointer_reset_all_cb(TimestampTz ts)
 {
 
@@ -251,6 +251,15 @@ pgstat_get_io_object_name(IOObject io_object)
 	pg_unreachable();
 }
 
+void
+pgstat_io_init_shmem_cb(void *stats)
+{
+	PgStatShared_IO *stat_shmem = (PgStatShared_IO *) stats;
+
+	for (int i = 0; i < BACKEND_NUM_TYPES; i++)
+		LWLockInitialize(&stat_shmem->locks[i], LWTRANCHE_PGSTATS_DATA);
+}
+
 void
 pgstat_io_reset_all_cb(TimestampTz ts)
 {
 
@@ -196,17 +196,18 @@ StatsShmemInit(void)
 
 		pg_atomic_init_u64(&ctl->gc_request_count, 1);
 
-
 		/* initialize fixed-numbered stats */
-		LWLockInitialize(&ctl->archiver.lock, LWTRANCHE_PGSTATS_DATA);
-		LWLockInitialize(&ctl->bgwriter.lock, LWTRANCHE_PGSTATS_DATA);
-		LWLockInitialize(&ctl->checkpointer.lock, LWTRANCHE_PGSTATS_DATA);
-		LWLockInitialize(&ctl->slru.lock, LWTRANCHE_PGSTATS_DATA);
-		LWLockInitialize(&ctl->wal.lock, LWTRANCHE_PGSTATS_DATA);
-
-		for (int i = 0; i < BACKEND_NUM_TYPES; i++)
-			LWLockInitialize(&ctl->io.locks[i],
-							 LWTRANCHE_PGSTATS_DATA);
+		for (int kind = PGSTAT_KIND_FIRST_VALID; kind <= PGSTAT_KIND_LAST; kind++)
+		{
+			const PgStat_KindInfo *kind_info = pgstat_get_kind_info(kind);
+			char	   *ptr;
+
+			if (!kind_info->fixed_amount)
+				continue;
+
+			ptr = ((char *) ctl) + kind_info->shared_ctl_off;
+			kind_info->init_shmem_cb(ptr);
+		}
 	}
 	else
 	{
 
@@ -192,6 +192,14 @@ pgstat_slru_flush(bool nowait)
 	return false;
 }
 
+void
+pgstat_slru_init_shmem_cb(void *stats)
+{
+	PgStatShared_SLRU *stats_shmem = (PgStatShared_SLRU *) stats;
+
+	LWLockInitialize(&stats_shmem->lock, LWTRANCHE_PGSTATS_DATA);
+}
+
 void
 pgstat_slru_reset_all_cb(TimestampTz ts)
 {
 
@@ -163,6 +163,14 @@ pgstat_have_pending_wal(void)
 		PendingWalStats.wal_sync != 0;
 }
 
+void
+pgstat_wal_init_shmem_cb(void *stats)
+{
+	PgStatShared_Wal *stats_shmem = (PgStatShared_Wal *) stats;
+
+	LWLockInitialize(&stats_shmem->lock, LWTRANCHE_PGSTATS_DATA);
+}
+
 void
 pgstat_wal_reset_all_cb(TimestampTz ts)
 {
 
@@ -251,6 +251,13 @@ typedef struct PgStat_KindInfo
 									   const PgStatShared_Common *header, NameData *name);
 	bool		(*from_serialized_name) (const NameData *name, PgStat_HashKey *key);
 
+	/*
+	 * For fixed-numbered statistics: Initialize shared memory state.
+	 *
+	 * "stats" is the pointer to the allocated shared memory area.
+	 */
+	void		(*init_shmem_cb) (void *stats);
+
 	/*
 	 * For fixed-numbered statistics: Reset All.
 	 */
@@ -528,6 +535,7 @@ extern void pgstat_snapshot_fixed(PgStat_Kind kind);
  * Functions in pgstat_archiver.c
  */
 
+extern void pgstat_archiver_init_shmem_cb(void *stats);
 extern void pgstat_archiver_reset_all_cb(TimestampTz ts);
 extern void pgstat_archiver_snapshot_cb(void);
 
@@ -536,6 +544,7 @@ extern void pgstat_archiver_snapshot_cb(void);
  * Functions in pgstat_bgwriter.c
  */
 
+extern void pgstat_bgwriter_init_shmem_cb(void *stats);
 extern void pgstat_bgwriter_reset_all_cb(TimestampTz ts);
 extern void pgstat_bgwriter_snapshot_cb(void);
 
@@ -544,6 +553,7 @@ extern void pgstat_bgwriter_snapshot_cb(void);
  * Functions in pgstat_checkpointer.c
  */
 
+extern void pgstat_checkpointer_init_shmem_cb(void *stats);
 extern void pgstat_checkpointer_reset_all_cb(TimestampTz ts);
 extern void pgstat_checkpointer_snapshot_cb(void);
 
@@ -574,6 +584,7 @@ extern bool pgstat_function_flush_cb(PgStat_EntryRef *entry_ref, bool nowait);
  */
 
 extern bool pgstat_flush_io(bool nowait);
+extern void pgstat_io_init_shmem_cb(void *stats);
 extern void pgstat_io_reset_all_cb(TimestampTz ts);
 extern void pgstat_io_snapshot_cb(void);
 
@@ -632,6 +643,7 @@ extern PgStatShared_Common *pgstat_init_entry(PgStat_Kind kind,
  */
 
 extern bool pgstat_slru_flush(bool nowait);
+extern void pgstat_slru_init_shmem_cb(void *stats);
 extern void pgstat_slru_reset_all_cb(TimestampTz ts);
 
@@ -644,6 +656,7 @@ extern bool pgstat_flush_wal(bool nowait);
 extern void pgstat_init_wal(void);
 extern bool pgstat_have_pending_wal(void);
 
+extern void pgstat_wal_init_shmem_cb(void *stats);
 extern void pgstat_wal_reset_all_cb(TimestampTz ts);
 extern void pgstat_wal_snapshot_cb(void);
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,14 @@ pgstat_fetch_stat_archiver(void)`
`62`	`62`	`return &pgStatLocal.snapshot.archiver;`
`63`	`63`	`}`
`64`	`64`
	`65`	`+void`
	`66`	`+pgstat_archiver_init_shmem_cb(void *stats)`
	`67`	`+{`
	`68`	`+ PgStatShared_Archiver stats_shmem = (PgStatShared_Archiver ) stats;`
	`69`	`+`
	`70`	`+ LWLockInitialize(&stats_shmem->lock, LWTRANCHE_PGSTATS_DATA);`
	`71`	`+}`
	`72`	`+`
`65`	`73`	`void`
`66`	`74`	`pgstat_archiver_reset_all_cb(TimestampTz ts)`
`67`	`75`	`{`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,14 @@ pgstat_fetch_stat_bgwriter(void)`
`75`	`75`	`return &pgStatLocal.snapshot.bgwriter;`
`76`	`76`	`}`
`77`	`77`
	`78`	`+void`
	`79`	`+pgstat_bgwriter_init_shmem_cb(void *stats)`
	`80`	`+{`
	`81`	`+ PgStatShared_BgWriter stats_shmem = (PgStatShared_BgWriter ) stats;`
	`82`	`+`
	`83`	`+ LWLockInitialize(&stats_shmem->lock, LWTRANCHE_PGSTATS_DATA);`
	`84`	`+}`
	`85`	`+`
`78`	`86`	`void`
`79`	`87`	`pgstat_bgwriter_reset_all_cb(TimestampTz ts)`
`80`	`88`	`{`
Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,14 @@ pgstat_fetch_stat_checkpointer(void)`
`84`	`84`	`return &pgStatLocal.snapshot.checkpointer;`
`85`	`85`	`}`
`86`	`86`
	`87`	`+void`
	`88`	`+pgstat_checkpointer_init_shmem_cb(void *stats)`
	`89`	`+{`
	`90`	`+ PgStatShared_Checkpointer stats_shmem = (PgStatShared_Checkpointer ) stats;`
	`91`	`+`
	`92`	`+ LWLockInitialize(&stats_shmem->lock, LWTRANCHE_PGSTATS_DATA);`
	`93`	`+}`
	`94`	`+`
`87`	`95`	`void`
`88`	`96`	`pgstat_checkpointer_reset_all_cb(TimestampTz ts)`
`89`	`97`	`{`
Original file line number	Diff line number	Diff line chan 10000 ge
`@@ -192,6 +192,14 @@ pgstat_slru_flush(bool nowait)`
`192`	`192`	`return false;`
`193`	`193`	`}`
`194`	`194`
	`195`	`+void`
	`196`	`+pgstat_slru_init_shmem_cb(void *stats)`
	`197`	`+{`
	`198`	`+ PgStatShared_SLRU stats_shmem = (PgStatShared_SLRU ) stats;`
	`199`	`+`
	`200`	`+ LWLockInitialize(&stats_shmem->lock, LWTRANCHE_PGSTATS_DATA);`
	`201`	`+}`
	`202`	`+`
`195`	`203`	`void`
`196`	`204`	`pgstat_slru_reset_all_cb(TimestampTz ts)`
`197`	`205`	`{`
Original file line number	Diff line number	Diff line change
`@@ -163,6 +163,14 @@ pgstat_have_pending_wal(void)`
`163`	`163`	`PendingWalStats.wal_sync != 0;`
`164`	`164`	`}`
`165`	`165`
	`166`	`+void`
	`167`	`+pgstat_wal_init_shmem_cb(void *stats)`
	`168`	`+{`
	`169`	`+ PgStatShared_Wal stats_shmem = (PgStatShared_Wal ) stats;`
	`170`	`+`
	`171`	`+ LWLockInitialize(&stats_shmem->lock, LWTRANCHE_PGSTATS_DATA);`
	`172`	`+}`
	`173`	`+`
`166`	`174`	`void`
`167`	`175`	`pgstat_wal_reset_all_cb(TimestampTz ts)`
`168`	`176`	`{`