Fix compatibility with pg15 new shmem_request_hook.

rjuju · rjuju · commit 7c89eda18a88 · 2022-05-14T16:01:56.000+08:00
Hook added upstream in 4f2400cb3f10aa79f99fba680c198237da28dd38.
diff --git a/pg_wait_sampling.c b/pg_wait_sampling.c
@@ -58,6 +58,9 @@ shm_mq		   *recv_mq = NULL;
 shm_mq_handle  *recv_mqh = NULL;
 LOCKTAG			queueTag;
 
+#if PG_VERSION_NUM >= 150000
+static shmem_request_hook_type prev_shmem_request_hook = NULL;
+#endif
 static shmem_startup_hook_type prev_shmem_startup_hook = NULL;
 static PGPROC * search_proc(int backendPid);
 static PlannedStmt *pgws_planner_hook(Query *parse,
@@ -91,6 +94,10 @@ get_max_procs_count(void)
 {
 	int count = 0;
 
+#if PG_VERSION_NUM >= 150000
+	Assert(MaxBackends > 0);
+	count += MaxBackends;
+#else
 	/*
 	 * MaxBackends: bgworkers, autovacuum workers and launcher.
 	 * This has to be in sync with the value computed in
@@ -105,7 +112,8 @@ get_max_procs_count(void)
 	 */
 #if PG_VERSION_NUM >= 120000
 	count += max_wal_senders;
-#endif
+#endif		/* pg 12+ */
+#endif		/* pg 15- */
 
 	/* AuxiliaryProcs */
 	count += NUM_AUXILIARY_PROCS;
@@ -265,6 +273,23 @@ setup_gucs()
 	}
 }
 
+#if PG_VERSION_NUM >= 150000
+/*
+ * shmem_request hook: request additional shared memory resources.
+ *
+ * If you change code here, don't forget to also report the modifications in
+ * _PG_init() for pg14 and below.
+ */
+static void
+pgws_shmem_request(void)
+{
+	if (prev_shmem_request_hook)
+		prev_shmem_request_hook();
+
+	RequestAddinShmemSpace(pgws_shmem_size());
+}
+#endif
+
 /*
  * Distribute shared memory.
  */
@@ -344,20 +369,27 @@ _PG_init(void)
 	if (!process_shared_preload_libraries_in_progress)
 		return;
 
+#if PG_VERSION_NUM < 150000
 	/*
 	 * Request additional shared resources.  (These are no-ops if we're not in
 	 * the postmaster process.)  We'll allocate or attach to the shared
 	 * resources in pgws_shmem_startup().
+	 *
+	 * If you change code here, don't forget to also report the modifications
+	 * in pgsp_shmem_request() for pg15 and later.
 	 */
 	RequestAddinShmemSpace(pgws_shmem_size());
+#endif
 
 	register_wait_collector();
 
 	/*
 	 * Install hooks.
 	 */
-	prev_shmem_startup_hook = shmem_startup_hook;
-	shmem_startup_hook		= pgws_shmem_startup;
+#if PG_VERSION_NUM >= 150000
+	prev_shmem_request_hook = shmem_request_hook;
+	shmem_request_hook		= pgws_shmem_request;
+#endif
 	prev_shmem_startup_hook = shmem_startup_hook;
 	shmem_startup_hook		= pgws_shmem_startup;
 	planner_hook_next		= planner_hook;
