PostgreSQL 15: all shared memory requests in shmem_request_hook()

Author: Andrei Krichinin

src/ddl.c

@@ -150,6 +150,11 @@ static void MtmFinishDDLCommand(void);
 
 PG_FUNCTION_INFO_V1(mtm_make_table_local);
 
+#if PG_VERSION_NUM >= 150000
+static shmem_request_hook_type prev_shmem_request_hook = NULL;
+static void mtm_ddl_shmem_request(void);
+#endif
+
 /*****************************************************************************
  *
  * Init
@@ -159,16 +164,14 @@ PG_FUNCTION_INFO_V1(mtm_make_table_local);
 void
 MtmDDLReplicationInit()
 {
-	Size		size = 0;
-
-	size = add_size(size, sizeof(struct DDLSharedState));
-	size = add_size(size, hash_estimate_size(MULTIMASTER_MAX_LOCAL_TABLES,
-											 sizeof(Oid)));
-	size = MAXALIGN(size);
-
+#if PG_VERSION_NUM >= 150000
+	prev_shmem_request_hook = shmem_request_hook;
+	shmem_request_hook = mtm_ddl_shmem_request;
+#else
 	RequestAddinShmemSpace(size);
 
 	RequestNamedLWLockTranche("mtm-ddl", 1);
+#endif
 
 	PreviousExecutorStartHook = ExecutorStart_hook;
 	ExecutorStart_hook = MtmExecutorStart;
@@ -183,6 +186,25 @@ MtmDDLReplicationInit()
 	SeqNextvalHook = MtmSeqNextvalHook;
 }
 
+#if PG_VERSION_NUM >= 150000
+static void
+mtm_ddl_shmem_request(void)
+{
+	Size		size = 0;
+
+	if (prev_shmem_request_hook)
+		prev_shmem_request_hook();
+
+	size = add_size(size, sizeof(struct DDLSharedState));
+	size = add_size(size, hash_estimate_size(MULTIMASTER_MAX_LOCAL_TABLES,
+											 sizeof(Oid)));
+	size = MAXALIGN(size);
+
+	RequestAddinShmemSpace(size);
+	RequestNamedLWLockTranche("mtm-ddl", 1);
+}
+#endif
+
 void
 MtmDDLReplicationShmemStartup(void)
 {

src/dmq.c

@@ -240,6 +240,11 @@ static volatile sig_atomic_t got_SIGHUP = false;
 
 static shmem_startup_hook_type PreviousShmemStartupHook;
 
+#if PG_VERSION_NUM >= 150000
+static shmem_request_hook_type prev_shmem_request_hook = NULL;
+static void mtm_dmq_shmem_request(void);
+#endif
+
 void *(*dmq_receiver_start_hook)(char *sender_name);
 dmq_hook_type dmq_receiver_stop_hook;
 dmq_hook_type dmq_sender_connect_hook;
@@ -364,14 +369,19 @@ static Size
 dmq_shmem_size(void)
 {
 	Size		size = 0;
-	int maxbackends = 0;
-
-	maxbackends = MaxConnections + autovacuum_max_workers +
-				max_worker_processes + max_wal_senders + 1;
+#if PG_VERSION_NUM < 150000
+	int maxbackends = MaxConnections + autovacuum_max_workers +
+					max_worker_processes + max_wal_senders + 1;
+#endif
 
 	size = add_size(size, sizeof(struct DmqSharedState));
+#if PG_VERSION_NUM >= 150000
+	size = add_size(size, hash_estimate_size(DMQ_MAX_SUBS_PER_BACKEND * MaxBackends,
+											 sizeof(DmqStreamSubscription)));
+#else
 	size = add_size(size, hash_estimate_size(DMQ_MAX_SUBS_PER_BACKEND * maxbackends,
 											 sizeof(DmqStreamSubscription)));
+#endif
 	return MAXALIGN(size);
 }
 
@@ -384,9 +394,14 @@ dmq_init(int send_timeout, int connect_timeout)
 		return;
 
 	/* Reserve area for our shared state */
+#if PG_VERSION_NUM >= 150000
+	prev_shmem_request_hook = shmem_request_hook;
+	shmem_request_hook = mtm_dmq_shmem_request;
+#else
 	RequestAddinShmemSpace(dmq_shmem_size());
 
 	RequestNamedLWLockTranche("dmq", 1);
+#endif
 
 	/* Set up common data for all our workers */
 	memset(&worker, 0, sizeof(worker));
@@ -408,6 +423,18 @@ dmq_init(int send_timeout, int connect_timeout)
 	shmem_startup_hook = dmq_shmem_startup_hook;
 }
 
+#if PG_VERSION_NUM >= 150000
+static void
+mtm_dmq_shmem_request(void)
+{
+	if (prev_shmem_request_hook)
+		prev_shmem_request_hook();
+
+	RequestAddinShmemSpace(dmq_shmem_size());
+	RequestNamedLWLockTranche("dmq", 1);
+}
+#endif
+
 static Size
 dmq_toc_size()
 {

src/global_tx.c

@@ -47,6 +47,11 @@ char const *const GlobalTxStatusMnem[] =
 	"GTXAborted"
 };
 
+#if PG_VERSION_NUM >= 150000
+static shmem_request_hook_type prev_shmem_request_hook = NULL;
+static void mtm_gtx_shmem_request(void);
+#endif
+
 int
 term_cmp(GlobalTxTerm t1, GlobalTxTerm t2)
 {
@@ -153,9 +158,25 @@ GlobalTxAtExit(int code, Datum arg)
 
 void
 MtmGlobalTxInit()
+{
+#if PG_VERSION_NUM >= 150000
+	prev_shmem_request_hook = shmem_request_hook;
+	shmem_request_hook = mtm_gtx_shmem_request;
+#else
+	RequestAddinShmemSpace(size);
+	RequestNamedLWLockTranche("mtm-gtx-lock", 1);
+#endif
+}
+
+#if PG_VERSION_NUM >= 150000
+static void
+mtm_gtx_shmem_request(void)
 {
 	Size		size = 0;
 
+	if (prev_shmem_request_hook)
+		prev_shmem_request_hook();
+
 	size = add_size(size, sizeof(gtx_shared_data));
 	size = add_size(size, hash_estimate_size(2*MaxConnections,
 											 sizeof(GlobalTx)));
@@ -164,6 +185,7 @@ MtmGlobalTxInit()
 	RequestAddinShmemSpace(size);
 	RequestNamedLWLockTranche("mtm-gtx-lock", 1);
 }
+#endif
 
 void
 MtmGlobalTxShmemStartup(void)

src/multimaster.c

@@ -220,6 +220,10 @@ bool mtm_config_valid;
 
 static shmem_startup_hook_type PreviousShmemStartupHook;
 
+#if PG_VERSION_NUM >= 150000
+static shmem_request_hook_type prev_shmem_request_hook = NULL;
+static void mtm_shmem_request(void);
+#endif
 
 /*
  * If you get really bored one day, you may try hardware-accelerated popcount
@@ -716,8 +720,13 @@ NULL);
 	 * the postmaster process.)	 We'll allocate or attach to the shared
 	 * resources in mtm_shmem_startup().
 	 */
+#if PG_VERSION_NUM >= 150000
+	prev_shmem_request_hook = shmem_request_hook;
+	shmem_request_hook = mtm_shmem_request;
+#else
 	RequestAddinShmemSpace(MTM_SHMEM_SIZE + sizeof(MtmTime));
 	RequestNamedLWLockTranche(MULTIMASTER_NAME, 2);
+#endif
 
 	dmq_init(MtmHeartbeatSendTimeout, MtmConnectTimeout);
 	dmq_receiver_start_hook = MtmOnDmqReceiverConnect;
@@ -750,6 +759,18 @@ NULL);
 #endif
 }
 
+#if PG_VERSION_NUM >= 150000
+static void
+mtm_shmem_request(void)
+{
+	if (prev_shmem_request_hook)
+		prev_shmem_request_hook();
+
+	RequestAddinShmemSpace(MTM_SHMEM_SIZE + sizeof(MtmTime));
+	RequestNamedLWLockTranche(MULTIMASTER_NAME, 2);
+}
+#endif
+
 /*
  * Module unload callback
  *

src/state.c

@@ -246,6 +246,11 @@ static PrepareBarrierMode pb_acquired_in_mode;
 
 static bool	campaign_requested;
 
+#if PG_VERSION_NUM >= 150000
+static shmem_request_hook_type prev_shmem_request_hook = NULL;
+static void mtm_state_shmem_request(void);
+#endif
+
 /*
  * -----------------------------------
  * Startup
@@ -255,10 +260,27 @@ static bool	campaign_requested;
 void
 MtmStateInit()
 {
+#if PG_VERSION_NUM >= 150000
+	prev_shmem_request_hook = shmem_request_hook;
+	shmem_request_hook = mtm_state_shmem_request;
+#else
 	RequestAddinShmemSpace(sizeof(struct MtmState));
 	RequestNamedLWLockTranche("mtm_state_locks", 3);
+#endif
 }
 
+#if PG_VERSION_NUM >= 150000
+static void
+mtm_state_shmem_request(void)
+{
+	if (prev_shmem_request_hook)
+		prev_shmem_request_hook();
+
+	RequestAddinShmemSpace(sizeof(struct MtmState));
+	RequestNamedLWLockTranche("mtm_state_locks", 3);
+}
+#endif
+
 void
 MtmStateShmemStartup()
 {