diff --git a/collector.c b/collector.c
index cd2762d..bf9440a 100644
--- a/collector.c
+++ b/collector.c
@@ -2,37 +2,65 @@
  * collector.c
  *		Collector of wait event history and profile.
  *
- * Copyright (c) 2015-2016, Postgres Professional
+ * Copyright (c) 2015-2025, Postgres Professional
  *
  * IDENTIFICATION
  *	  contrib/pg_wait_sampling/pg_wait_sampling.c
  */
 #include "postgres.h"
 
-#include "catalog/pg_type.h"
-#if PG_VERSION_NUM >= 130000
-#include "common/hashfn.h"
-#endif
-#include "funcapi.h"
 #include "miscadmin.h"
+#include "pg_wait_sampling.h"
 #include "postmaster/bgworker.h"
 #include "postmaster/interrupt.h"
-#include "storage/ipc.h"
-#include "storage/procarray.h"
+#include "storage/latch.h"
+#include "storage/lock.h"
+#include "storage/lwlock.h"
+#include "storage/proc.h"
 #include "storage/procsignal.h"
 #include "storage/shm_mq.h"
-#include "storage/shm_toc.h"
-#include "storage/spin.h"
-#include "utils/memutils.h"
-#include "utils/resowner.h"
+#include "utils/guc.h"
+#include "utils/hsearch.h"
+#include "utils/timestamp.h"
+#if PG_VERSION_NUM < 140000
 #include "pgstat.h"
+#else
+#include "utils/wait_event.h"
+#endif
 
-#include "compat.h"
-#include "pg_wait_sampling.h"
+static inline shm_mq_result
+shm_mq_send_compat(shm_mq_handle *mqh, Size nbytes, const void *data,
+				   bool nowait, bool force_flush)
+{
+#if PG_VERSION_NUM >= 150000
+	return shm_mq_send(mqh, nbytes, data, nowait, force_flush);
+#else
+	return shm_mq_send(mqh, nbytes, data, nowait);
+#endif
+}
 
-static volatile sig_atomic_t shutdown_requested = false;
+#if PG_VERSION_NUM < 170000
+#define INIT_PG_LOAD_SESSION_LIBS		0x0001
+#define INIT_PG_OVERRIDE_ALLOW_CONNS	0x0002
+#endif
 
-static void handle_sigterm(SIGNAL_ARGS);
+static inline void
+InitPostgresCompat(const char *in_dbname, Oid dboid,
+				   const char *username, Oid useroid,
+				   bits32 flags,
+				   char *out_dbname)
+{
+#if PG_VERSION_NUM >= 170000
+	InitPostgres(in_dbname, dboid, username, useroid, flags, out_dbname);
+#elif PG_VERSION_NUM >= 150000
+	InitPostgres(in_dbname, dboid, username, useroid,
+				 flags & INIT_PG_LOAD_SESSION_LIBS,
+				 flags & INIT_PG_OVERRIDE_ALLOW_CONNS, out_dbname);
+#else
+	InitPostgres(in_dbname, dboid, username, useroid, out_dbname,
+				 flags & INIT_PG_OVERRIDE_ALLOW_CONNS);
+#endif
+}
 
 /*
  * Register background worker for collecting waits history.
@@ -111,16 +139,6 @@ realloc_history(History *observations, int count)
 	observations->wraparound = false;
 }
 
-static void
-handle_sigterm(SIGNAL_ARGS)
-{
-	int save_errno = errno;
-	shutdown_requested = true;
-	if (MyProc)
-		SetLatch(&MyProc->procLatch);
-	errno = save_errno;
-}
-
 /*
  * Get next item of history with rotation.
  */
@@ -129,6 +147,7 @@ get_next_observation(History *observations)
 {
 	HistoryItem *result;
 
+	/* Check for wraparound */
 	if (observations->index >= observations->count)
 	{
 		observations->index = 0;
@@ -215,6 +234,7 @@ send_history(History *observations, shm_mq_handle *mqh)
 	else
 		count = observations->index;
 
+	/* Send array size first since receive_array expects this */
 	mq_result = shm_mq_send_compat(mqh, sizeof(count), &count, false, true);
 	if (mq_result == SHM_MQ_DETACHED)
 	{
@@ -251,6 +271,7 @@ send_profile(HTAB *profile_hash, shm_mq_handle *mqh)
 	Size			count = hash_get_num_entries(profile_hash);
 	shm_mq_result	mq_result;
 
+	/* Send array size first since receive_array expects this */
 	mq_result = shm_mq_send_compat(mqh, sizeof(count), &count, false, true);
 	if (mq_result == SHM_MQ_DETACHED)
 	{
@@ -283,32 +304,11 @@ make_profile_hash()
 {
 	HASHCTL hash_ctl;
 
-	hash_ctl.hash = tag_hash;
-	hash_ctl.hcxt = TopMemoryContext;
-
-	if (pgws_profileQueries)
-		hash_ctl.keysize = offsetof(ProfileItem, count);
-	else
-		hash_ctl.keysize = offsetof(ProfileItem, queryId);
-
+	/* We always include queryId in hash key */
+	hash_ctl.keysize = offsetof(ProfileItem, count);
 	hash_ctl.entrysize = sizeof(ProfileItem);
 	return hash_create("Waits profile hash", 1024, &hash_ctl,
-					   HASH_FUNCTION | HASH_ELEM);
-}
-
-/*
- * Delta between two timestamps in milliseconds.
- */
-static int64
-millisecs_diff(TimestampTz tz1, TimestampTz tz2)
-{
-	long	secs;
-	int		microsecs;
-
-	TimestampDifference(tz1, tz2, &secs, &microsecs);
-
-	return secs * 1000 + microsecs / 1000;
-
+					   HASH_ELEM | HASH_BLOBS);
 }
 
 /*
@@ -319,65 +319,37 @@ pgws_collector_main(Datum main_arg)
 {
 	HTAB		   *profile_hash = NULL;
 	History			observations;
-	MemoryContext	old_context,
-					collector_context;
 	TimestampTz		current_ts,
 					history_ts,
 					profile_ts;
 
-	/*
-	 * Establish signal handlers.
-	 *
-	 * We want CHECK_FOR_INTERRUPTS() to kill off this worker process just as
-	 * it would a normal user backend.  To make that happen, we establish a
-	 * signal handler that is a stripped-down version of die().  We don't have
-	 * any equivalent of the backend's command-read loop, where interrupts can
-	 * be processed immediately, so make sure ImmediateInterruptOK is turned
-	 * off.
-	 *
-	 * We also want to respond to the ProcSignal notifications.  This is done
-	 * in the upstream provided procsignal_sigusr1_handler, which is
-	 * automatically used if a bgworker connects to a database.  But since our
-	 * worker doesn't connect to any database even though it calls
-	 * InitPostgres, which will still initializze a new backend and thus
-	 * partitipate to the ProcSignal infrastructure.
-	 */
-	pqsignal(SIGTERM, handle_sigterm);
+	/* Establish signal handlers */
 	pqsignal(SIGHUP, SignalHandlerForConfigReload);
 	pqsignal(SIGUSR1, procsignal_sigusr1_handler);
 	BackgroundWorkerUnblockSignals();
 	InitPostgresCompat(NULL, InvalidOid, NULL, InvalidOid, 0, NULL);
 	SetProcessingMode(NormalProcessing);
 
-	/* Make pg_wait_sampling recognisable in pg_stat_activity */
-	pgstat_report_appname("pg_wait_sampling collector");
 
-	profile_hash = make_profile_hash();
 	pgws_collector_hdr->latch = &MyProc->procLatch;
 
-	CurrentResourceOwner = ResourceOwnerCreate(NULL, "pg_wait_sampling collector");
-	collector_context = AllocSetContextCreate(TopMemoryContext,
-			"pg_wait_sampling context", ALLOCSET_DEFAULT_SIZES);
-	old_context = MemoryContextSwitchTo(collector_context);
 	alloc_history(&observations, pgws_historySize);
-	MemoryContextSwitchTo(old_context);
+	profile_hash = make_profile_hash();
 
-	ereport(LOG, (errmsg("pg_wait_sampling collector started")));
+	ereport(LOG, errmsg("pg_wait_sampling collector started"));
 
 	/* Start counting time for history and profile samples */
 	profile_ts = history_ts = GetCurrentTimestamp();
 
 	while (1)
 	{
-		int				rc;
 		shm_mq_handle  *mqh;
 		int64			history_diff,
 						profile_diff;
 		bool			write_history,
 						write_profile;
 
-		/* We need an explicit call for at least ProcSignal notifications. */
-		CHECK_FOR_INTERRUPTS();
+		HandleMainLoopInterrupts();
 
 		if (ConfigReloadPending)
 		{
@@ -385,11 +357,11 @@ pgws_collector_main(Datum main_arg)
 			ProcessConfigFile(PGC_SIGHUP);
 		}
 
-		/* Wait calculate time to next sample for history or profile */
+		/* Calculate time to next sample for history or profile */
 		current_ts = GetCurrentTimestamp();
 
-		history_diff = millisecs_diff(history_ts, current_ts);
-		profile_diff = millisecs_diff(profile_ts, current_ts);
+		history_diff = TimestampDifferenceMilliseconds(history_ts, current_ts);
+		profile_diff = TimestampDifferenceMilliseconds(profile_ts, current_ts);
 
 		write_history = (history_diff >= (int64)pgws_historyPeriod);
 		write_profile = (profile_diff >= (int64)pgws_profilePeriod);
@@ -412,20 +384,15 @@ pgws_collector_main(Datum main_arg)
 			}
 		}
 
-		/* Shutdown if requested */
-		if (shutdown_requested)
-			break;
-
 		/*
-		 * Wait until next sample time or request to do something through
+		 * Wait for sample time or until request to do something through
 		 * shared memory.
 		 */
-		rc = WaitLatch(&MyProc->procLatch, WL_LATCH_SET | WL_TIMEOUT | WL_POSTMASTER_DEATH,
-				Min(pgws_historyPeriod - (int)history_diff,
-					pgws_historyPeriod - (int)profile_diff), PG_WAIT_EXTENSION);
-
-		if (rc & WL_POSTMASTER_DEATH)
-			proc_exit(1);
+		WaitLatch(&MyProc->procLatch,
+				  WL_LATCH_SET | WL_TIMEOUT | WL_EXIT_ON_PM_DEATH,
+				  Min(pgws_historyPeriod - (int)history_diff,
+					  pgws_profilePeriod - (int)profile_diff),
+				  PG_WAIT_EXTENSION);
 
 		ResetLatch(&MyProc->procLatch);
 
@@ -484,15 +451,4 @@ pgws_collector_main(Datum main_arg)
 			LockRelease(&tag, ExclusiveLock, false);
 		}
 	}
-
-	MemoryContextReset(collector_context);
-
-	/*
-	 * We're done.  Explicitly detach the shared memory segment so that we
-	 * don't get a resource leak warning at commit time.  This will fire any
-	 * on_dsm_detach callbacks we've registered, as well.  Once that's done,
-	 * we can go ahead and exit.
-	 */
-	ereport(LOG, (errmsg("pg_wait_sampling collector shutting down")));
-	proc_exit(0);
 }
diff --git a/compat.h b/compat.h
deleted file mode 100644
index 5371ae2..0000000
--- a/compat.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * compat.h
- *		Definitions for function wrappers compatible between PG versions.
- *
- * Copyright (c) 2015-2022, Postgres Professional
- *
- * IDENTIFICATION
- *	  contrib/pg_wait_sampling/compat.h
- */
-#ifndef __COMPAT_H__
-#define __COMPAT_H__
-
-#include "postgres.h"
-
-#include "access/tupdesc.h"
-#include "miscadmin.h"
-#include "storage/shm_mq.h"
-#include "utils/guc_tables.h"
-
-static inline shm_mq_result
-shm_mq_send_compat(shm_mq_handle *mqh, Size nbytes, const void *data,
-				   bool nowait, bool force_flush)
-{
-#if PG_VERSION_NUM >= 150000
-	return shm_mq_send(mqh, nbytes, data, nowait, force_flush);
-#else
-	return shm_mq_send(mqh, nbytes, data, nowait);
-#endif
-}
-
-#if PG_VERSION_NUM < 170000
-#define INIT_PG_LOAD_SESSION_LIBS		0x0001
-#define INIT_PG_OVERRIDE_ALLOW_CONNS	0x0002
-#endif
-
-static inline void
-InitPostgresCompat(const char *in_dbname, Oid dboid,
-				   const char *username, Oid useroid,
-				   bits32 flags,
-				   char *out_dbname)
-{
-#if PG_VERSION_NUM >= 170000
-	InitPostgres(in_dbname, dboid, username, useroid, flags, out_dbname);
-#elif PG_VERSION_NUM >= 150000
-	InitPostgres(in_dbname, dboid, username, useroid,
-				 flags & INIT_PG_LOAD_SESSION_LIBS,
-				 flags & INIT_PG_OVERRIDE_ALLOW_CONNS, out_dbname);
-#else
-	InitPostgres(in_dbname, dboid, username, useroid, out_dbname,
-				 flags & INIT_PG_OVERRIDE_ALLOW_CONNS);
-#endif
-}
-
-#endif
diff --git a/pg_wait_sampling.c b/pg_wait_sampling.c
index 153d875..c17894d 100644
--- a/pg_wait_sampling.c
+++ b/pg_wait_sampling.c
@@ -2,7 +2,7 @@
  * pg_wait_sampling.c
  *		Track information about wait events.
  *
- * Copyright (c) 2015-2017, Postgres Professional
+ * Copyright (c) 2015-2025, Postgres Professional
  *
  * IDENTIFICATION
  *	  contrib/pg_wait_sampling/pg_wait_sampling.c
@@ -10,31 +10,32 @@
 #include "postgres.h"
 
 #include "access/htup_details.h"
-#include "access/twophase.h"
-#include "catalog/pg_type.h"
-#include "fmgr.h"
+#include "access/tupdesc.h"
+#include "catalog/pg_type_d.h"
+#include "executor/executor.h"
 #include "funcapi.h"
 #include "miscadmin.h"
 #include "optimizer/planner.h"
-#include "pgstat.h"
+#include "pg_wait_sampling.h"
 #include "postmaster/autovacuum.h"
 #include "replication/walsender.h"
 #include "storage/ipc.h"
-#include "storage/pg_shmem.h"
-#include "storage/procarray.h"
+#include "storage/latch.h"
+#include "storage/lock.h"
+#include "storage/proc.h"
 #include "storage/shm_mq.h"
 #include "storage/shm_toc.h"
-#include "storage/spin.h"
+#include "storage/shmem.h"
 #include "tcop/utility.h"
 #include "utils/builtins.h"
-#include "utils/datetime.h"
-#include "utils/guc_tables.h"
 #include "utils/guc.h"
-#include "utils/memutils.h" /* TopMemoryContext.  Actually for PG 9.6 only,
-							 * but there should be no harm for others. */
-
-#include "compat.h"
-#include "pg_wait_sampling.h"
+#include "utils/memutils.h"
+#include "utils/timestamp.h"
+#if PG_VERSION_NUM < 140000
+#include "pgstat.h"
+#else
+#include "utils/wait_event.h"
+#endif
 
 PG_MODULE_MAGIC;
 
@@ -42,7 +43,7 @@ void		_PG_init(void);
 
 static bool shmem_initialized = false;
 
-/* Hooks */
+/* Hook varibales */
 static ExecutorStart_hook_type	prev_ExecutorStart = NULL;
 static ExecutorRun_hook_type 	prev_ExecutorRun = NULL;
 static ExecutorFinish_hook_type prev_ExecutorFinish = NULL;
@@ -63,11 +64,12 @@ static shm_mq *recv_mq = NULL;
 static shm_mq_handle *recv_mqh = NULL;
 static LOCKTAG queueTag;
 
+/* Hook functions */
 #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 PGPROC *search_proc(int backendPid);
 static PlannedStmt *pgws_planner_hook(Query *parse,
 #if PG_VERSION_NUM >= 130000
 		const char *query_string,
@@ -124,7 +126,6 @@ static const struct config_enum_entry pgws_profile_queries_options[] =
 	{NULL, 		0, false}
 };
 
-/* GUC variables */
 int pgws_historySize = 5000;
 int pgws_historyPeriod = 10;
 int pgws_profilePeriod = 10;
@@ -250,6 +251,7 @@ pgws_shmem_startup(void)
 
 	if (!found)
 	{
+		/* Create shared objects */
 		toc = shm_toc_create(PG_WAIT_SAMPLING_MAGIC, pgws, segsize);
 
 		pgws_collector_hdr = shm_toc_allocate(toc, sizeof(CollectorShmqHeader));
@@ -263,6 +265,7 @@ pgws_shmem_startup(void)
 	}
 	else
 	{
+		/* Get existing shared objects */
 		toc = shm_toc_attach(PG_WAIT_SAMPLING_MAGIC, pgws);
 		pgws_collector_hdr = shm_toc_lookup(toc, 0, false);
 		pgws_collector_mq = shm_toc_lookup(toc, 1, false);
@@ -517,6 +520,7 @@ pg_wait_sampling_get_current(PG_FUNCTION_ARGS)
 
 		if (!PG_ARGISNULL(0))
 		{
+			/* pg_wait_sampling_get_current(pid int4) function */
 			HistoryItem	   *item;
 			PGPROC		   *proc;
 
@@ -530,6 +534,7 @@ pg_wait_sampling_get_current(PG_FUNCTION_ARGS)
 		}
 		else
 		{
+			/* pg_wait_sampling_current view */
 			int		procCount = ProcGlobal->allProcCount,
 					i,
 					j = 0;
@@ -595,6 +600,7 @@ pg_wait_sampling_get_current(PG_FUNCTION_ARGS)
 	}
 	else
 	{
+		/* nothing left */
 		SRF_RETURN_DONE(funcctx);
 	}
 }
@@ -616,6 +622,7 @@ pgws_init_lock_tag(LOCKTAG *tag, uint32 lock)
 	tag->locktag_lockmethodid = USER_LOCKMETHOD;
 }
 
+/* Get array (history or profile data) from shared memory */
 static void *
 receive_array(SHMRequest request, Size item_size, Size *count)
 {
diff --git a/pg_wait_sampling.h b/pg_wait_sampling.h
index 141269a..56daa01 100644
--- a/pg_wait_sampling.h
+++ b/pg_wait_sampling.h
@@ -2,7 +2,7 @@
  * pg_wait_sampling.h
  *		Headers for pg_wait_sampling extension.
  *
- * Copyright (c) 2015-2016, Postgres Professional
+ * Copyright (c) 2015-2025, Postgres Professional
  *
  * IDENTIFICATION
  *	  contrib/pg_wait_sampling/pg_wait_sampling.h
@@ -10,8 +10,6 @@
 #ifndef __PG_WAIT_SAMPLING_H__
 #define __PG_WAIT_SAMPLING_H__
 
-#include "postgres.h"
-
 #include "storage/proc.h"
 #include "storage/shm_mq.h"
 #include "utils/timestamp.h"

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/postgrespro/pg_wait_sampling/pull/89.diff" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/postgrespro/pg_wait_sampling/pull/89.diff" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/postgrespro/pg_wait_sampling/pull/89.diff" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/postgrespro/pg_wait_sampling/pull/89.diff" target="_blank">pFad v4 Proxy</a></p></body>
</html>