Commitab9ed9b

committed

Assert that pgwin32_signal_initialize() has been called early enough.

Before the pgwin32_signal_initialize() call, the backend version ofpg_usleep() has no effect. No in-tree code falls afoul of that today,but temporary commit2307868 did so.Discussion:https://postgr.es/m/20190402135442.GA1173872@rfd.leadboat.com

1 parentf433394 commitab9ed9bCopy full SHA for ab9ed9b

File tree

-0

lines changed

-0

lines changed

Lines changed: 3 additions & 0 deletions

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(longmicrosec)`
`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`	`intexec_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(intsignum)`
`211`	`213`	`{`
	`214`	`+Assert(pgwin32_signal_event!=NULL);`
`212`	`215`	`if (signum >=PG_SIGNAL_COUNT\|\|signum <=0)`
`213`	`216`	`return;`
`214`	`217`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,9 @@ pgwin32_open(const char *fileName, int fileFlags,...)`
`70`	`70`	`(O_RANDOM \|O_SEQUENTIAL \|O_TEMPORARY) \|`
`71`	`71`	`_O_SHORT_LIVED \|O_DSYNC \|O_DIRECT \|`
`72`	`72`	`(O_CREAT \|O_TRUNC \|O_EXCL) \| (O_TEXT \|O_BINARY)))==fileFlags);`
	`73`	`+#ifndefFRONTEND`
	`74`	`+Assert(pgwin32_signal_event!=NULL);/* small chance of pg_usleep() */`
	`75`	`+#endif`
`73`	`76`
`74`	`77`	`#ifdefFRONTEND`
`75`	`78`

Comments

(0)