From e28b7aff4e68099fe5eb1ea6d43b1d2aa2c89fab Mon Sep 17 00:00:00 2001 From: Aleksandr Parfenov Date: Mon, 5 Mar 2018 13:18:03 +0300 Subject: [PATCH 1/2] Fix Windows Access Violation error during collector start up --- collector.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/collector.c b/collector.c index 1011d0f..848102d 100644 --- a/collector.c +++ b/collector.c @@ -42,7 +42,7 @@ register_wait_collector(void) worker.bgw_start_time = BgWorkerStart_ConsistentState; worker.bgw_restart_time = 0; worker.bgw_notify_pid = 0; -#if PG_VERSION_NUM >= 100000 +#if PG_VERSION_NUM >= 100000 || defined(WIN32) memcpy(worker.bgw_library_name, "pg_wait_sampling", BGW_MAXLEN); memcpy(worker.bgw_function_name, CppAsString(collector_main), BGW_MAXLEN); #else From c44b33a015239f9c6484c9560a63a5a6e12ef7ca Mon Sep 17 00:00:00 2001 From: Aleksandr Parfenov Date: Mon, 5 Mar 2018 13:37:23 +0300 Subject: [PATCH 2/2] Fix potentional non-NULL value of bgw_main in case bgw_function_name usage --- collector.c | 1 + 1 file changed, 1 insertion(+) diff --git a/collector.c b/collector.c index 848102d..da6a335 100644 --- a/collector.c +++ b/collector.c @@ -45,6 +45,7 @@ register_wait_collector(void) #if PG_VERSION_NUM >= 100000 || defined(WIN32) memcpy(worker.bgw_library_name, "pg_wait_sampling", BGW_MAXLEN); memcpy(worker.bgw_function_name, CppAsString(collector_main), BGW_MAXLEN); + worker.bgw_main = NULL; #else worker.bgw_main = collector_main; #endif