Commitf333204

committed

Actually, it's not that hard to merge the Windows pqsignal code ...

... just need to typedef sigset_t and provide sigemptyset/sigfillset,which are easy enough.

1 parent2c713d6 commitf333204Copy full SHA for f333204

File tree

+10

-35

lines changed

+10

-35

lines changed

Lines changed: 1 addition & 23 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,15 +18,10 @@`
`18`	`18`	`#include"libpq/pqsignal.h"`
`19`	`19`
`20`	`20`
`21`		`-#ifndefWIN32`
	`21`	`+/* Global variables */`
`22`	`22`	`sigset_tUnBlockSig,`
`23`	`23`	`BlockSig,`
`24`	`24`	`StartupBlockSig;`
`25`		`-#else`
`26`		`-intUnBlockSig,`
`27`		`-BlockSig,`
`28`		`-StartupBlockSig;`
`29`		`-#endif`
`30`	`25`
`31`	`26`
`32`	`27`	`/*`
`@@ -45,8 +40,6 @@ intUnBlockSig,`
`45`	`40`	`void`
`46`	`41`	`pqinitmask(void)`
`47`	`42`	`{`
`48`		`-#ifndefWIN32`
`49`		`-`
`50`	`43`	`sigemptyset(&UnBlockSig);`
`51`	`44`
`52`	`45`	`/* First set all signals, then clear some. */`
`@@ -101,19 +94,4 @@ pqinitmask(void)`
`101`	`94`	`#ifdefSIGALRM`
`102`	`95`	`sigdelset(&StartupBlockSig,SIGALRM);`
`103`	`96`	`#endif`
`104`		`-#else/* WIN32 */`
`105`		`-/* Set the signals we want. */`
`106`		`-UnBlockSig=0;`
`107`		`-BlockSig=sigmask(SIGQUIT) \|`
`108`		`-sigmask(SIGTERM) \|sigmask(SIGALRM) \|`
`109`		`-/* common signals between two */`
`110`		`-sigmask(SIGHUP) \|`
`111`		`-sigmask(SIGINT) \|sigmask(SIGUSR1) \|`
`112`		`-sigmask(SIGUSR2) \|sigmask(SIGCHLD) \|`
`113`		`-sigmask(SIGWINCH) \|sigmask(SIGFPE);`
`114`		`-StartupBlockSig=sigmask(SIGHUP) \|`
`115`		`-sigmask(SIGINT) \|sigmask(SIGUSR1) \|`
`116`		`-sigmask(SIGUSR2) \|sigmask(SIGCHLD) \|`
`117`		`-sigmask(SIGWINCH) \|sigmask(SIGFPE);`
`118`		`-#endif`
`119`	`97`	`}`

Lines changed: 9 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,27 +16,24 @@`
`16`	`16`	`#include<signal.h>`
`17`	`17`
`18`	`18`	`#ifndefWIN32`
`19`		`-externsigset_tUnBlockSig,`
`20`		`-BlockSig,`
`21`		`-StartupBlockSig;`
`22`		`-`
`23`	`19`	`#definePG_SETMASK(mask)sigprocmask(SIG_SETMASK, mask, NULL)`
`24`		`-#else/* WIN32 */`
`25`		`-/*`
`26`		`- * Windows doesn't provide the POSIX signal API, so we use something`
`27`		`- * approximating the old BSD signal API.`
`28`		`- */`
`29`		`-externintUnBlockSig,`
`30`		`-BlockSig,`
`31`		`-StartupBlockSig;`
	`20`	`+#else`
	`21`	`+/* Emulate POSIX sigset_t APIs on Windows */`
	`22`	`+typedefintsigset_t;`
`32`	`23`
`33`	`24`	`externintpqsigsetmask(intmask);`
`34`	`25`
`35`	`26`	`#definePG_SETMASK(mask)pqsigsetmask(*(mask))`
	`27`	`+#definesigemptyset(set)(*(set) = 0)`
	`28`	`+#definesigfillset(set)(*(set) = ~0)`
`36`	`29`	`#definesigaddset(set,signum)(*(set) \|= (sigmask(signum)))`
`37`	`30`	`#definesigdelset(set,signum)(*(set) &= ~(sigmask(signum)))`
`38`	`31`	`#endif/* WIN32 */`
`39`	`32`
	`33`	`+externsigset_tUnBlockSig,`
	`34`	`+BlockSig,`
	`35`	`+StartupBlockSig;`
	`36`	`+`
`40`	`37`	`externvoidpqinitmask(void);`
`41`	`38`
`42`	`39`	`#endif/* PQSIGNAL_H */`

Comments

(0)