Commitb63b967

committed

If there is no sigdelset(), define it as a macro.

This removes some duplicate code that recreated the identical workaroundwhen the newer signal API is missing.

1 parent52fc007 commitb63b967Copy full SHA for b63b967

File tree

-18

lines changed

-18

lines changed

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@`
`38`	`38`	`*`
`39`	`39`	`*`
`40`	`40`	`* IDENTIFICATION`
`41`		`- * $PostgreSQL: pgsql/src/backend/postmaster/bgwriter.c,v 1.63 2009/07/31 20:26:22 tgl Exp $`
	`41`	`+ * $PostgreSQL: pgsql/src/backend/postmaster/bgwriter.c,v 1.64 2009/12/16 22:55:33 petere Exp $`
`42`	`42`	`*`
`43`	`43`	`*-------------------------------------------------------------------------`
`44`	`44`	`*/`
`@@ -244,11 +244,7 @@ BackgroundWriterMain(void)`
`244`	`244`	`pqsignal(SIGWINCH,SIG_DFL);`
`245`	`245`
`246`	`246`	`/* We allow SIGQUIT (quickdie) at all times */`
`247`		`-#ifdefHAVE_SIGPROCMASK`
`248`	`247`	`sigdelset(&BlockSig,SIGQUIT);`
`249`		`-#else`
`250`		`-BlockSig &= ~(sigmask(SIGQUIT));`
`251`		`-#endif`
`252`	`248`
`253`	`249`	`/*`
`254`	`250`	`* Initialize so that first time-driven event happens at the correct time.`

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`*`
`35`	`35`	`*`
`36`	`36`	`* IDENTIFICATION`
`37`		`- * $PostgreSQL: pgsql/src/backend/postmaster/walwriter.c,v 1.8 2009/07/31 20:26:23 tgl Exp $`
	`37`	`+ * $PostgreSQL: pgsql/src/backend/postmaster/walwriter.c,v 1.9 2009/12/16 22:55:33 petere Exp $`
`38`	`38`	`*`
`39`	`39`	`*-------------------------------------------------------------------------`
`40`	`40`	`*/`
`@@ -126,11 +126,7 @@ WalWriterMain(void)`
`126`	`126`	`pqsignal(SIGWINCH,SIG_DFL);`
`127`	`127`
`128`	`128`	`/* We allow SIGQUIT (quickdie) at all times */`
`129`		`-#ifdefHAVE_SIGPROCMASK`
`130`	`129`	`sigdelset(&BlockSig,SIGQUIT);`
`131`		`-#else`
`132`		`-BlockSig &= ~(sigmask(SIGQUIT));`
`133`		`-#endif`
`134`	`130`
`135`	`131`	`/*`
`136`	`132`	`* Create a resource owner to keep track of our resources (not clear that`

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.576 2009/12/15 04:57:47 rhaas Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.577 2009/12/16 22:55:33 petere Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* this is the "main" module of the postgres backend and`
`@@ -3292,11 +3292,7 @@ PostgresMain(int argc, char argv[], const char username)`
`3292`	`3292`	`if (IsUnderPostmaster)`
`3293`	`3293`	`{`
`3294`	`3294`	`/* We allow SIGQUIT (quickdie) at all times */`
`3295`		`-#ifdefHAVE_SIGPROCMASK`
`3296`	`3295`	`sigdelset(&BlockSig,SIGQUIT);`
`3297`		`-#else`
`3298`		`-BlockSig &= ~(sigmask(SIGQUIT));`
`3299`		`-#endif`
`3300`	`3296`	`}`
`3301`	`3297`
`3302`	`3298`	`PG_SETMASK(&BlockSig);/* block everything except SIGQUIT */`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`		`- * $PostgreSQL: pgsql/src/include/libpq/pqsignal.h,v 1.34 2009/08/29 19:26:51 tgl Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/include/libpq/pqsignal.h,v 1.35 2009/12/16 22:55:34 petere Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`* This shouldn't be in libpq, but the monitor and some other`
`@@ -26,7 +26,7 @@ extern sigset_t UnBlockSig,`
`26`	`26`	`StartupBlockSig;`
`27`	`27`
`28`	`28`	`#definePG_SETMASK(mask)sigprocmask(SIG_SETMASK, mask, NULL)`
`29`		`-#else`
	`29`	`+#else/* not HAVE_SIGPROCMASK */`
`30`	`30`	`externintUnBlockSig,`
`31`	`31`	`BlockSig,`
`32`	`32`	`StartupBlockSig;`
`@@ -37,7 +37,9 @@ extern intUnBlockSig,`
`37`	`37`	`#definePG_SETMASK(mask)pqsigsetmask(((int)(mask)))`
`38`	`38`	`intpqsigsetmask(intmask);`
`39`	`39`	`#endif`
`40`		`-#endif`
	`40`	`+`
	`41`	`+#definesigdelset(set,signum)(*(set) &= ~(sigmask(signum)))`
	`42`	`+#endif/* not HAVE_SIGPROCMASK */`
`41`	`43`
`42`	`44`	`typedefvoid (*pqsigfunc) (int);`
`43`	`45`

Comments

(0)