Add compability with pg10

Author: ildus

.gitignore

@@ -1,3 +1,4 @@
 .deps
 *.o
-*.so
+*.so
+/results

collector.c

@@ -21,13 +21,13 @@
 #include "storage/spin.h"
 #include "utils/memutils.h"
 #include "utils/resowner.h"
+#include "pgstat.h"
 
 #include "pg_wait_sampling.h"
 
 static volatile sig_atomic_t shutdown_requested = false;
 
 static void handle_sigterm(SIGNAL_ARGS);
-static void collector_main(Datum main_arg);
 
 /*
  * Register background worker for collecting waits history.
@@ -41,8 +41,13 @@ register_wait_collector(void)
 	worker.bgw_flags = BGWORKER_SHMEM_ACCESS;
 	worker.bgw_start_time = BgWorkerStart_ConsistentState;
 	worker.bgw_restart_time = 0;
-	worker.bgw_main = collector_main;
 	worker.bgw_notify_pid = 0;
+#if PG_VERSION_NUM >= 100000
+	memcpy(worker.bgw_library_name, "pg_wait_sampling", BGW_MAXLEN);
+	memcpy(worker.bgw_function_name, CppAsString(collector_main), BGW_MAXLEN);
+#else
+	worker.bgw_main = collector_main;
+#endif
 	snprintf(worker.bgw_name, BGW_MAXLEN, "pg_wait_sampling collector");
 	worker.bgw_main_arg = (Datum)0;
 	RegisterBackgroundWorker(&worker);
@@ -263,7 +268,7 @@ millisecs_diff(TimestampTz tz1, TimestampTz tz2)
 /*
  * Main routine of wait history collector.
  */
-static void
+void
 collector_main(Datum main_arg)
 {
  	HTAB		   *profile_hash = NULL;
@@ -351,9 +356,15 @@ collector_main(Datum main_arg)
 		 * Wait until next sample time or request to do something through
 		 * shared memory.
 		 */
+#if PG_VERSION_NUM >= 100000
+		rc = WaitLatch(&MyProc->procLatch, WL_LATCH_SET | WL_TIMEOUT | WL_POSTMASTER_DEATH,
+				Min(history_period - (int)history_diff,
+					profile_period - (int)profile_diff), PG_WAIT_EXTENSION);
+#else
 		rc = WaitLatch(&MyProc->procLatch, WL_LATCH_SET | WL_TIMEOUT | WL_POSTMASTER_DEATH,
 				Min(history_period - (int)history_diff,
 					profile_period - (int)profile_diff));
+#endif
 
 		if (rc & WL_POSTMASTER_DEATH)
 			proc_exit(1);

expected/load_1.out

@@ -0,0 +1,19 @@
+CREATE EXTENSION pg_wait_sampling;
+\d pg_wait_sampling_current
+        View "public.pg_wait_sampling_current"
+   Column   |  Type   | Collation | Nullable | Default 
+------------+---------+-----------+----------+---------
+ pid        | integer |           |          | 
+ event_type | text    |           |          | 
+ event      | text    |           |          | 
+
+\d pg_wait_sampling_history
+                 View "public.pg_wait_sampling_history"
+   Column   |           Type           | Collation | Nullable | Default 
+------------+--------------------------+-----------+----------+---------
+ pid        | integer                  |           |          | 
+ ts         | timestamp with time zone |           |          | 
+ event_type | text                     |           |          | 
+ event      | text                     |           |          | 
+
+DROP EXTENSION pg_wait_sampling;

pg_wait_sampling.c

@@ -205,8 +205,13 @@ pgws_shmem_startup(void)
 	{
 		toc = shm_toc_attach(PG_WAIT_SAMPLING_MAGIC, pgws);
 
+#if PG_VERSION_NUM >= 100000
+		collector_hdr = shm_toc_lookup(toc, 0, false);
+		collector_mq = shm_toc_lookup(toc, 1, false);
+#else
 		collector_hdr = shm_toc_lookup(toc, 0);
 		collector_mq = shm_toc_lookup(toc, 1);
+#endif
 	}
 
 	shmem_initialized = true;

pg_wait_sampling.h

@@ -77,5 +77,6 @@ extern void init_lock_tag(LOCKTAG *tag, uint32 lock);
 /* collector.c */
 extern void register_wait_collector(void);
 extern void alloc_history(History *, int);
+extern void collector_main(Datum main_arg);
 
 #endif