Add missing PG_SETMASK(&BlockSig) to SIGHUP_handler().

tglsfdc · tglsfdc · commit 823ab922951a · 2001-06-14T19:59:24.000Z
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
@@ -28,7 +28,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.219 2001/06/12 22:54:05 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.220 2001/06/14 19:59:24 tgl Exp $
  *
  * NOTES
  *
@@ -1408,10 +1408,14 @@ SIGHUP_handler(SIGNAL_ARGS)
 {
 	int			save_errno = errno;
 
-	if (Shutdown > SmartShutdown)
-		return;
-	got_SIGHUP = true;
-	SignalChildren(SIGHUP);
+	PG_SETMASK(&BlockSig);
+
+	if (Shutdown <= SmartShutdown)
+	{
+		got_SIGHUP = true;
+		SignalChildren(SIGHUP);
+	}
+
 	errno = save_errno;
 }
 
@@ -1567,13 +1571,10 @@ static void
 reaper(SIGNAL_ARGS)
 {
 	int			save_errno = errno;
-
 #ifdef HAVE_WAITPID
 	int			status;			/* backend exit status */
-
 #else
 	union wait	status;			/* backend exit status */
-
 #endif
 	int			exitstatus;
 	int			pid;			/* process id of dead backend */

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`*`
`29`	`29`	`*`
`30`	`30`	`* IDENTIFICATION`
`31`		`- * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.219 2001/06/12 22:54:05 tgl Exp $`
	`31`	`+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.220 2001/06/14 19:59:24 tgl Exp $`
`32`	`32`	`*`
`33`	`33`	`* NOTES`
`34`	`34`	`*`
`@@ -1408,10 +1408,14 @@ SIGHUP_handler(SIGNAL_ARGS)`
`1408`	`1408`	`{`
`1409`	`1409`	`int save_errno = errno;`
`1410`	`1410`
`1411`		`- if (Shutdown > SmartShutdown)`
`1412`		`- return;`
`1413`		`- got_SIGHUP = true;`
`1414`		`- SignalChildren(SIGHUP);`
	`1411`	`+ PG_SETMASK(&BlockSig);`
	`1412`	`+`
	`1413`	`+ if (Shutdown <= SmartShutdown)`
	`1414`	`+ {`
	`1415`	`+ got_SIGHUP = true;`
	`1416`	`+ SignalChildren(SIGHUP);`
	`1417`	`+ }`
	`1418`	`+`
`1415`	`1419`	`errno = save_errno;`
`1416`	`1420`	`}`
`1417`	`1421`
`@@ -1567,13 +1571,10 @@ static void`
`1567`	`1571`	`reaper(SIGNAL_ARGS)`
`1568`	`1572`	`{`
`1569`	`1573`	`int save_errno = errno;`
`1570`		`-`
`1571`	`1574`	`#ifdef HAVE_WAITPID`
`1572`	`1575`	`int status; /* backend exit status */`
`1573`		`-`
`1574`	`1576`	`#else`
`1575`	`1577`	`union wait status; /* backend exit status */`
`1576`		`-`
`1577`	`1578`	`#endif`
`1578`	`1579`	`int exitstatus;`
`1579`	`1580`	`int pid; /* process id of dead backend */`