Assert that pgwin32_signal_initialize() has been called early enough.

nmisch · nmisch · commit ab9ed9be2378 · 2019-04-03T17:11:16.000-07:00
Before the pgwin32_signal_initialize() call, the backend version of pg_usleep() has no effect. No in-tree code falls afoul of that today, but temporary commit 2307868 did so. Discussion: https://postgr.es/m/20190402135442.GA1173872@rfd.leadboat.com
diff --git a/src/backend/port/win32/signal.c b/src/backend/port/win32/signal.c
@@ -52,6 +52,7 @@ static BOOL WINAPI pg_console_handler(DWORD dwCtrlType);
 void
 pg_usleep(long microsec)
 {
+	Assert(pgwin32_signal_event != NULL);
 	if (WaitForSingleObject(pgwin32_signal_event,
 							(microsec < 500 ? 1 : (microsec + 500) / 1000))
 		== WAIT_OBJECT_0)
@@ -108,6 +109,7 @@ pgwin32_dispatch_queued_signals(void)
 {
 	int			exec_mask;
 
+	Assert(pgwin32_signal_event != NULL);
 	EnterCriticalSection(&pg_signal_crit_sec);
 	while ((exec_mask = UNBLOCKED_SIGNAL_QUEUE()) != 0)
 	{
@@ -209,6 +211,7 @@ pgwin32_create_signal_listener(pid_t pid)
 void
 pg_queue_signal(int signum)
 {
+	Assert(pgwin32_signal_event != NULL);
 	if (signum >= PG_SIGNAL_COUNT || signum <= 0)
 		return;
 
diff --git a/src/port/open.c b/src/port/open.c
@@ -70,6 +70,9 @@ pgwin32_open(const char *fileName, int fileFlags,...)
 						 (O_RANDOM | O_SEQUENTIAL | O_TEMPORARY) |
 						 _O_SHORT_LIVED | O_DSYNC | O_DIRECT |
 						 (O_CREAT | O_TRUNC | O_EXCL) | (O_TEXT | O_BINARY))) == fileFlags);
+#ifndef FRONTEND
+	Assert(pgwin32_signal_event != NULL);	/* small chance of pg_usleep() */
+#endif
 
 #ifdef FRONTEND
 

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ static BOOL WINAPI pg_console_handler(DWORD dwCtrlType);`
`52`	`52`	`void`
`53`	`53`	`pg_usleep(long microsec)`
`54`	`54`	`{`
	`55`	`+ Assert(pgwin32_signal_event != NULL);`
`55`	`56`	`if (WaitForSingleObject(pgwin32_signal_event,`
`56`	`57`	`(microsec < 500 ? 1 : (microsec + 500) / 1000))`
`57`	`58`	`== WAIT_OBJECT_0)`
`@@ -108,6 +109,7 @@ pgwin32_dispatch_queued_signals(void)`
`108`	`109`	`{`
`109`	`110`	`int exec_mask;`
`110`	`111`
	`112`	`+ Assert(pgwin32_signal_event != NULL);`
`111`	`113`	`EnterCriticalSection(&pg_signal_crit_sec);`
`112`	`114`	`while ((exec_mask = UNBLOCKED_SIGNAL_QUEUE()) != 0)`
`113`	`115`	`{`
`@@ -209,6 +211,7 @@ pgwin32_create_signal_listener(pid_t pid)`
`209`	`211`	`void`
`210`	`212`	`pg_queue_signal(int signum)`
`211`	`213`	`{`
	`214`	`+ Assert(pgwin32_signal_event != NULL);`
`212`	`215`	`if (signum >= PG_SIGNAL_COUNT \|\| signum <= 0)`
`213`	`216`	`return;`
`214`	`217`