Separate out bgwriter code into a logically separate module, rather

than being random pieces of other files.  Give bgwriter responsibility
for all checkpoint activity (other than a post-recovery checkpoint);
so this child process absorbs the functionality of the former transient
checkpoint and shutdown subprocesses.  While at it, create an actual
include file for postmaster.c, which for some reason never had its own
file before.

src/backend/access/transam/slru.c

@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/access/transam/slru.c,v 1.14 2004/05/28 05:12:42 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/slru.c,v 1.15 2004/05/29 22:48:18 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,6 +17,7 @@
 #include <unistd.h>
 
 #include "access/slru.h"
+#include "postmaster/bgwriter.h"
 #include "storage/fd.h"
 #include "storage/lwlock.h"
 #include "miscadmin.h"
@@ -795,8 +796,8 @@ SimpleLruTruncate(SlruCtl ctl, int cutoffPage)
 	if (!SlruScanDirectory(ctl, cutoffPage, false))
 		return;					/* nothing to remove */
 
-	/* Perform a forced CHECKPOINT */
-	CreateCheckPoint(false, true);
+	/* Perform a CHECKPOINT */
+	RequestCheckpoint(true);
 
 	/*
 	 * Scan shared memory and remove any pages preceding the cutoff page,

src/backend/access/transam/xlog.c

@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.144 2004/05/28 05:12:42 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.145 2004/05/29 22:48:18 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,10 +27,10 @@
 #include "access/xlogutils.h"
 #include "catalog/catversion.h"
 #include "catalog/pg_control.h"
+#include "postmaster/bgwriter.h"
 #include "storage/bufpage.h"
 #include "storage/fd.h"
 #include "storage/lwlock.h"
-#include "storage/pmsignal.h"
 #include "storage/proc.h"
 #include "storage/sinval.h"
 #include "storage/spin.h"
@@ -1206,9 +1206,9 @@ XLogWrite(XLogwrtRqst WriteRqst)
 				{
 #ifdef WAL_DEBUG
 					if (XLOG_DEBUG)
-						elog(LOG, "time for a checkpoint, signaling postmaster");
+						elog(LOG, "time for a checkpoint, signaling bgwriter");
 #endif
-					SendPostmasterSignal(PMSIGNAL_DO_CHECKPOINT);
+					RequestCheckpoint(false);
 				}
 			}
 			LWLockRelease(ControlFileLock);
@@ -3087,11 +3087,6 @@ StartupXLOG(void)
 				RmgrTable[rmid].rm_cleanup();
 		}
 
-		/* suppress in-transaction check in CreateCheckPoint */
-		MyLastRecPtr.xrecoff = 0;
-		MyXactMadeXLogEntry = false;
-		MyXactMadeTempRelUpdate = false;
-
 		/*
 		 * At this point, ThisStartUpID is the largest SUI that we could
 		 * find evidence for in the WAL entries.  But check it against
@@ -3293,11 +3288,6 @@ ShutdownXLOG(int code, Datum arg)
 	ereport(LOG,
 			(errmsg("shutting down")));
 
-	/* suppress in-transaction check in CreateCheckPoint */
-	MyLastRecPtr.xrecoff = 0;
-	MyXactMadeXLogEntry = false;
-	MyXactMadeTempRelUpdate = false;
-
 	CritSectionCount++;
 	CreateCheckPoint(true, true);
 	ShutdownCLOG();
@@ -3324,27 +3314,13 @@ CreateCheckPoint(bool shutdown, bool force)
 	uint32		_logId;
 	uint32		_logSeg;
 
-	if (MyXactMadeXLogEntry)
-		ereport(ERROR,
-				(errcode(ERRCODE_ACTIVE_SQL_TRANSACTION),
-		  errmsg("checkpoint cannot be made inside transaction block")));
-
 	/*
 	 * Acquire CheckpointLock to ensure only one checkpoint happens at a
-	 * time.
-	 *
-	 * The CheckpointLock can be held for quite a while, which is not good
-	 * because we won't respond to a cancel/die request while waiting for
-	 * an LWLock.  (But the alternative of using a regular lock won't work
-	 * for background checkpoint processes, which are not regular
-	 * backends.)  So, rather than use a plain LWLockAcquire, use this
-	 * kluge to allow an interrupt to be accepted while we are waiting:
+	 * time.  (This is just pro forma, since in the present system
+	 * structure there is only one process that is allowed to issue
+	 * checkpoints at any given time.)
 	 */
-	while (!LWLockConditionalAcquire(CheckpointLock, LW_EXCLUSIVE))
-	{
-		CHECK_FOR_INTERRUPTS();
-		pg_usleep(1000000L);
-	}
+	LWLockAcquire(CheckpointLock, LW_EXCLUSIVE);
 
 	/*
 	 * Use a critical section to force system panic if we have trouble.

src/backend/bootstrap/bootstrap.c

@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.181 2004/05/28 05:12:45 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.182 2004/05/29 22:48:18 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -33,6 +33,7 @@
 #include "executor/executor.h"
 #include "libpq/pqsignal.h"
 #include "miscadmin.h"
+#include "postmaster/bgwriter.h"
 #include "pgtime.h"
 #include "storage/freespace.h"
 #include "storage/ipc.h"
@@ -50,6 +51,8 @@
 #define ALLOC(t, c)		((t *) calloc((unsigned)(c), sizeof(t)))
 
 extern int	Int_yyparse(void);
+static void usage(void);
+static void bootstrap_signals(void);
 static hashnode *AddStr(char *str, int strlength, int mderef);
 static Form_pg_attribute AllocateAttribute(void);
 static bool BootstrapAlreadySeen(Oid id);
@@ -192,44 +195,8 @@ typedef struct _IndexList
 static IndexList *ILHead = NULL;
 
 
-/* ----------------------------------------------------------------
- *						misc functions
- * ----------------------------------------------------------------
- */
-
-/* ----------------
- *		error handling / abort routines
- * ----------------
- */
-void
-err_out(void)
-{
-	Warnings++;
-	cleanup();
-}
-
-/* usage:
- *		usage help for the bootstrap backend
- */
-static void
-usage(void)
-{
-	fprintf(stderr,
-			gettext("Usage:\n"
-					"  postgres -boot [OPTION]... DBNAME\n"
-					"  -c NAME=VALUE    set run-time parameter\n"
-					"  -d 1-5           debug level\n"
-					"  -D datadir       data directory\n"
-					"  -F               turn off fsync\n"
-					"  -o file          send debug output to file\n"
-					"  -x num           internal use\n"));
-
-	proc_exit(1);
-}
-
-
 /*
- *	 The main loop for running the backend in bootstrap mode
+ *	 The main entry point for running the backend in bootstrap mode
  *
  *	 The bootstrap mode is used to initialize the template database.
  *	 The bootstrap backend doesn't speak SQL, but instead expects
@@ -387,19 +354,13 @@ BootstrapMain(int argc, char *argv[])
 		switch (xlogop)
 		{
 			case BS_XLOG_STARTUP:
-				statmsg = "startup subprocess";
-				break;
-			case BS_XLOG_CHECKPOINT:
-				statmsg = "checkpoint subprocess";
+				statmsg = "startup process";
 				break;
 			case BS_XLOG_BGWRITER:
-				statmsg = "bgwriter subprocess";
-				break;
-			case BS_XLOG_SHUTDOWN:
-				statmsg = "shutdown subprocess";
+				statmsg = "writer process";
 				break;
 			default:
-				statmsg = "??? subprocess";
+				statmsg = "??? process";
 				break;
 		}
 		init_ps_display(statmsg, "", "");
@@ -415,48 +376,9 @@ BootstrapMain(int argc, char *argv[])
 		pg_timezone_initialize();
 	}
 
-	if (IsUnderPostmaster)
-	{
-		/*
-		 * Properly accept or ignore signals the postmaster might send us
-		 */
-		pqsignal(SIGHUP, SIG_IGN);
-		pqsignal(SIGINT, SIG_IGN);		/* ignore query-cancel */
-		pqsignal(SIGTERM, die);
-		pqsignal(SIGQUIT, quickdie);
-		pqsignal(SIGALRM, SIG_IGN);
-		pqsignal(SIGPIPE, SIG_IGN);
-		pqsignal(SIGUSR1, SIG_IGN);
-		pqsignal(SIGUSR2, SIG_IGN);
-
-		/*
-		 * Reset some signals that are accepted by postmaster but not here
-		 */
-		pqsignal(SIGCHLD, SIG_DFL);
-		pqsignal(SIGTTIN, SIG_DFL);
-		pqsignal(SIGTTOU, SIG_DFL);
-		pqsignal(SIGCONT, SIG_DFL);
-		pqsignal(SIGWINCH, SIG_DFL);
-
-		/*
-		 * Unblock signals (they were blocked when the postmaster forked
-		 * us)
-		 */
-		PG_SETMASK(&UnBlockSig);
-	}
-	else
-	{
-		/* Set up appropriately for interactive use */
-		pqsignal(SIGHUP, die);
-		pqsignal(SIGINT, die);
-		pqsignal(SIGTERM, die);
-		pqsignal(SIGQUIT, die);
-
-		/*
-		 * Create lockfile for data directory.
-		 */
+	/* If standalone, create lockfile for data directory */
+	if (!IsUnderPostmaster)
 		CreateDataDirLockFile(DataDir, false);
-	}
 
 	SetProcessingMode(BootstrapProcessing);
 	IgnoreSystemIndexes(true);
@@ -488,37 +410,30 @@ BootstrapMain(int argc, char *argv[])
 	switch (xlogop)
 	{
 		case BS_XLOG_NOP:
+			bootstrap_signals();
 			break;
 
 		case BS_XLOG_BOOTSTRAP:
+			bootstrap_signals();
 			BootStrapXLOG();
 			StartupXLOG();
 			break;
 
-		case BS_XLOG_CHECKPOINT:
-			InitXLOGAccess();
-			CreateCheckPoint(false, false);
-			proc_exit(0);		/* done */
-
-		case BS_XLOG_BGWRITER:
-			InitXLOGAccess();
-			BufferBackgroundWriter();
-			proc_exit(0);		/* done */
-
 		case BS_XLOG_STARTUP:
+			bootstrap_signals();
 			StartupXLOG();
 			LoadFreeSpaceMap();
-			proc_exit(0);		/* done */
+			proc_exit(0);		/* startup done */
 
-		case BS_XLOG_SHUTDOWN:
+		case BS_XLOG_BGWRITER:
+			/* don't set signals, bgwriter has its own agenda */
 			InitXLOGAccess();
-			ShutdownXLOG(0, 0);
-			DumpFreeSpaceMap(0, 0);
-			proc_exit(0);		/* done */
+			BackgroundWriterMain();
+			proc_exit(1);		/* should never return */
 
 		default:
 			elog(PANIC, "unrecognized XLOG op: %d", xlogop);
-			proc_exit(0);
+			proc_exit(1);
 	}
 
 	SetProcessingMode(BootstrapProcessing);
@@ -575,9 +490,90 @@ BootstrapMain(int argc, char *argv[])
 
 	/* not reached, here to make compiler happy */
 	return 0;
+}
+
+
+/* ----------------------------------------------------------------
+ *						misc functions
+ * ----------------------------------------------------------------
+ */
+
+/* usage:
+ *		usage help for the bootstrap backend
+ */
+static void
+usage(void)
+{
+	fprintf(stderr,
+			gettext("Usage:\n"
+					"  postgres -boot [OPTION]... DBNAME\n"
+					"  -c NAME=VALUE    set run-time parameter\n"
+					"  -d 1-5           debug level\n"
+					"  -D datadir       data directory\n"
+					"  -F               turn off fsync\n"
+					"  -o file          send debug output to file\n"
+					"  -x num           internal use\n"));
 
+	proc_exit(1);
 }
 
+/*
+ * Set up signal handling for a bootstrap process
+ */
+static void
+bootstrap_signals(void)
+{
+	if (IsUnderPostmaster)
+	{
+		/*
+		 * Properly accept or ignore signals the postmaster might send us
+		 */
+		pqsignal(SIGHUP, SIG_IGN);
+		pqsignal(SIGINT, SIG_IGN);		/* ignore query-cancel */
+		pqsignal(SIGTERM, die);
+		pqsignal(SIGQUIT, quickdie);
+		pqsignal(SIGALRM, SIG_IGN);
+		pqsignal(SIGPIPE, SIG_IGN);
+		pqsignal(SIGUSR1, SIG_IGN);
+		pqsignal(SIGUSR2, SIG_IGN);
+
+		/*
+		 * Reset some signals that are accepted by postmaster but not here
+		 */
+		pqsignal(SIGCHLD, SIG_DFL);
+		pqsignal(SIGTTIN, SIG_DFL);
+		pqsignal(SIGTTOU, SIG_DFL);
+		pqsignal(SIGCONT, SIG_DFL);
+		pqsignal(SIGWINCH, SIG_DFL);
+
+		/*
+		 * Unblock signals (they were blocked when the postmaster forked
+		 * us)
+		 */
+		PG_SETMASK(&UnBlockSig);
+	}
+	else
+	{
+		/* Set up appropriately for interactive use */
+		pqsignal(SIGHUP, die);
+		pqsignal(SIGINT, die);
+		pqsignal(SIGTERM, die);
+		pqsignal(SIGQUIT, die);
+	}
+}
+
+/* ----------------
+ *		error handling / abort routines
+ * ----------------
+ */
+void
+err_out(void)
+{
+	Warnings++;
+	cleanup();
+}
+
+
 /* ----------------------------------------------------------------
  *				MANUAL BACKEND INTERACTIVE INTERFACE COMMANDS
  * ----------------------------------------------------------------

src/backend/libpq/pqsignal.c

@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/libpq/pqsignal.c,v 1.33 2004/04/12 16:19:18 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/libpq/pqsignal.c,v 1.34 2004/05/29 22:48:19 tgl Exp $
  *
  * NOTES
  *		This shouldn't be in libpq, but the monitor and some other
@@ -46,6 +46,17 @@
 #include "libpq/pqsignal.h"
 
 
+#ifdef HAVE_SIGPROCMASK
+sigset_t	UnBlockSig,
+			BlockSig,
+			AuthBlockSig;
+#else
+int			UnBlockSig,
+			BlockSig,
+			AuthBlockSig;
+#endif
+
+
 /*
  * Initialize BlockSig, UnBlockSig, and AuthBlockSig.
  *
@@ -153,4 +164,5 @@ pqsignal(int signo, pqsigfunc func)
 	return oact.sa_handler;
 #endif   /* !HAVE_POSIX_SIGNALS */
 }
+
 #endif /* WIN32 */

src/backend/main/main.c

@@ -13,7 +13,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/main/main.c,v 1.84 2004/05/28 05:12:50 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/main/main.c,v 1.85 2004/05/29 22:48:19 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -34,12 +34,13 @@
 #include <sys/param.h>
 #endif
 
-#include "miscadmin.h"
 #include "bootstrap/bootstrap.h"
+#include "miscadmin.h"
+#include "pgstat.h"
+#include "postmaster/postmaster.h"
 #include "tcop/tcopprot.h"
 #include "utils/help_config.h"
 #include "utils/ps_status.h"
-#include "pgstat.h"
 #ifdef WIN32
 #include "libpq/pqsignal.h"
 #endif

src/backend/postmaster/Makefile

 #-------------------------------------------------------------------------
 #
 # Makefile--
-#    Makefile for postmaster
+#    Makefile for src/backend/postmaster
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/postmaster/Makefile,v 1.14 2003/11/29 19:51:55 pgsql Exp $
+#    $PostgreSQL: pgsql/src/backend/postmaster/Makefile,v 1.15 2004/05/29 22:48:19 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -12,7 +12,7 @@ subdir = src/backend/postmaster
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = postmaster.o pgstat.o
+OBJS = postmaster.o bgwriter.o pgstat.o
 
 all: SUBSYS.o
 

src/backend/postmaster/pgstat.c

@@ -13,7 +13,7 @@
  *
  *	Copyright (c) 2001-2003, PostgreSQL Global Development Group
  *
- *	$PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.72 2004/05/28 05:12:58 tgl Exp $
+ *	$PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.73 2004/05/29 22:48:19 tgl Exp $
  * ----------
  */
 #include "postgres.h"
@@ -32,23 +32,25 @@
 
 #include "pgstat.h"
 
-#include "access/xact.h"
 #include "access/heapam.h"
+#include "access/xact.h"
 #include "catalog/catname.h"
-#include "catalog/pg_shadow.h"
 #include "catalog/pg_database.h"
-#include "libpq/pqsignal.h"
+#include "catalog/pg_shadow.h"
 #include "libpq/libpq.h"
+#include "libpq/pqsignal.h"
 #include "mb/pg_wchar.h"
 #include "miscadmin.h"
-#include "utils/memutils.h"
+#include "postmaster/postmaster.h"
 #include "storage/backendid.h"
 #include "storage/ipc.h"
 #include "storage/pg_shmem.h"
+#include "storage/pmsignal.h"
 #include "tcop/tcopprot.h"
-#include "utils/rel.h"
 #include "utils/hsearch.h"
+#include "utils/memutils.h"
 #include "utils/ps_status.h"
+#include "utils/rel.h"
 #include "utils/syscache.h"
 
 
@@ -75,8 +77,6 @@ bool		pgstat_is_running = false;
 NON_EXEC_STATIC int	pgStatSock = -1;
 static int	pgStatPipe[2];
 static struct sockaddr_storage pgStatAddr;
-static int	pgStatPmPipe[2] = {-1, -1};
-static int  pgStatCollectorPmPipe[2] = {-1, -1};
 
 static int	pgStatPid;
 static time_t last_pgstat_start_time;
@@ -397,17 +397,6 @@ pgstat_init(void)
 		goto startup_failed;
 	}
 
-	/*
-	 * Create the pipe that controls the statistics collector shutdown
-	 */
-	if (pgpipe(pgStatPmPipe) < 0 || pgpipe(pgStatCollectorPmPipe) < 0)
-	{
-		ereport(LOG,
-				(errcode_for_socket_access(),
-		  errmsg("could not create pipe for statistics collector: %m")));
-		goto startup_failed;
-	}
-
 	freeaddrinfo_all(hints.ai_family, addrs);
 
 	return;
@@ -439,9 +428,9 @@ startup_failed:
 static pid_t
 pgstat_forkexec(STATS_PROCESS_TYPE procType)
 {
-	char *av[12];
+	char *av[10];
 	int ac = 0, bufc = 0, i;
-	char pgstatBuf[7][32];
+	char pgstatBuf[2][32];
 
 	av[ac++] = "postgres";
 
@@ -464,11 +453,7 @@ pgstat_forkexec(STATS_PROCESS_TYPE procType)
 	/* postgres_exec_path is not passed by write_backend_variables */
 	av[ac++] = postgres_exec_path;
 
-	/* Sockets + pipes (those not passed by write_backend_variables) */
-	snprintf(pgstatBuf[bufc++],32,"%d",pgStatPmPipe[0]);
-	snprintf(pgstatBuf[bufc++],32,"%d",pgStatPmPipe[1]);
-	snprintf(pgstatBuf[bufc++],32,"%d",pgStatCollectorPmPipe[0]);
-	snprintf(pgstatBuf[bufc++],32,"%d",pgStatCollectorPmPipe[1]);
+	/* Pipe file ids (those not passed by write_backend_variables) */
 	snprintf(pgstatBuf[bufc++],32,"%d",pgStatPipe[0]);
 	snprintf(pgstatBuf[bufc++],32,"%d",pgStatPipe[1]);
 
@@ -493,14 +478,10 @@ pgstat_forkexec(STATS_PROCESS_TYPE procType)
 static void
 pgstat_parseArgs(int argc, char *argv[])
 {
-	Assert(argc == 10);
+	Assert(argc == 6);
 
 	argc = 3;
 	StrNCpy(postgres_exec_path,	argv[argc++], MAXPGPATH);
-	pgStatPmPipe[0]	= atoi(argv[argc++]);
-	pgStatPmPipe[1]	= atoi(argv[argc++]);
-	pgStatCollectorPmPipe[0] = atoi(argv[argc++]);
-	pgStatCollectorPmPipe[1] = atoi(argv[argc++]);
 	pgStatPipe[0]	= atoi(argv[argc++]);
 	pgStatPipe[1]	= atoi(argv[argc++]);
 }
@@ -592,8 +573,8 @@ pgstat_start(void)
 			/* Specific beos actions after backend startup */
 			beos_backend_startup();
 #endif
-			/* Close the postmaster's sockets, except for pgstat link */
-			ClosePostmasterPorts(false);
+			/* Close the postmaster's sockets */
+			ClosePostmasterPorts();
 
 			/* Drop our connection to postmaster's shared memory, as well */
 			PGSharedMemoryDetach();
@@ -632,31 +613,6 @@ pgstat_ispgstat(int pid)
 }
 
 
-/* ----------
- * pgstat_close_sockets() -
- *
- *	Called when postmaster forks a non-pgstat child process, to close off
- *	file descriptors that should not be held open in child processes.
- * ----------
- */
-void
-pgstat_close_sockets(void)
-{
-	if (pgStatPmPipe[0] >= 0)
-		closesocket(pgStatPmPipe[0]);
-	pgStatPmPipe[0] = -1;
-	if (pgStatPmPipe[1] >= 0)
-		closesocket(pgStatPmPipe[1]);
-	pgStatPmPipe[1] = -1;
-	if (pgStatCollectorPmPipe[0] >= 0)
-		closesocket(pgStatCollectorPmPipe[0]);
-	pgStatCollectorPmPipe[0] = -1;
-	if (pgStatCollectorPmPipe[1] >= 0)
-		closesocket(pgStatCollectorPmPipe[1]);
-	pgStatCollectorPmPipe[1] = -1;
-}
-
-
 /* ----------
  * pgstat_beterm() -
  *
@@ -1445,15 +1401,6 @@ PgstatBufferMain(int argc, char *argv[])
 	pgstat_parseArgs(argc,argv);
 #endif
 
-	/*
-	 * Close the writing end of the postmaster pipe, so we'll see it
-	 * closing when the postmaster terminates and can terminate as well.
-	 */
-	closesocket(pgStatPmPipe[1]);
-	pgStatPmPipe[1] = -1;
-	closesocket(pgStatCollectorPmPipe[1]);
-	pgStatCollectorPmPipe[1] = -1;
-
 	/*
 	 * Start a buffering process to read from the socket, so we have a
 	 * little more time to process incoming messages.
@@ -1517,7 +1464,6 @@ PgstatCollectorMain(int argc, char *argv[])
 	PgStat_Msg	msg;
 	fd_set		rfds;
 	int			readPipe;
-	int			pmPipe;
 	int			nready;
 	int			len = 0;
 	struct timeval timeout;
@@ -1555,7 +1501,6 @@ PgstatCollectorMain(int argc, char *argv[])
 	/* Close unwanted files */
 	closesocket(pgStatPipe[1]);
 	closesocket(pgStatSock);
-	pmPipe = pgStatCollectorPmPipe[0];
 
 	/*
 	 * Identify myself via ps
@@ -1823,17 +1768,9 @@ PgstatCollectorMain(int argc, char *argv[])
 	 * shutdown, we want to save the final stats to reuse at next startup.
 	 * But if the buffer process failed, it seems best not to (there may
 	 * even now be a new collector firing up, and we don't want it to read
-	 * a partially- rewritten stats file).	We can tell whether the
-	 * postmaster is still alive by checking to see if the postmaster pipe
-	 * is still open.  If it is read-ready (ie, EOF), the postmaster must
-	 * have quit.
+	 * a partially-rewritten stats file).
 	 */
-	FD_ZERO(&rfds);
-	FD_SET(pmPipe, &rfds);
-	timeout.tv_sec = 0;
-	timeout.tv_usec = 0;
-	nready = select(pmPipe+1,&rfds,NULL,NULL,&timeout);
-	if (nready > 0 && FD_ISSET(pmPipe, &rfds)) 
+	if (!PostmasterIsAlive(false))
 		pgstat_write_statsfile();
 }
 
@@ -1852,8 +1789,8 @@ pgstat_recvbuffer(void)
 {
 	fd_set		rfds;
 	fd_set		wfds;
+	struct timeval timeout;
 	int			writePipe = pgStatPipe[1];
-	int			pmPipe = pgStatPmPipe[0];
 	int			maxfd;
 	int			nready;
 	int			len;
@@ -1937,8 +1874,7 @@ pgstat_recvbuffer(void)
 
 		/*
 		 * If we have messages to write out, we add the pipe to the write
-		 * descriptor set. Otherwise, we check if the postmaster might
-		 * have terminated.
+		 * descriptor set.
 		 */
 		if (msg_have > 0)
 		{
@@ -1946,17 +1882,16 @@ pgstat_recvbuffer(void)
 			if (writePipe > maxfd)
 				maxfd = writePipe;
 		}
-		else
-		{
-			FD_SET(pmPipe, &rfds);
-			if (pmPipe > maxfd)
-				maxfd = pmPipe;
-		}
 
 		/*
-		 * Wait for some work to do.
+		 * Wait for some work to do; but not for more than 10 seconds
+		 * (this determines how quickly we will shut down after postmaster
+		 * termination).
 		 */
-		nready = select(maxfd + 1, &rfds, &wfds, NULL, NULL);
+		timeout.tv_sec = 10;
+		timeout.tv_usec = 0;
+
+		nready = select(maxfd + 1, &rfds, &wfds, NULL, &timeout);
 		if (nready < 0)
 		{
 			if (errno == EINTR)
@@ -2062,11 +1997,9 @@ pgstat_recvbuffer(void)
 			continue;
 
 		/*
-		 * If the pipe from the postmaster is ready for reading, the
-		 * kernel must have closed it on exit() (the postmaster never
-		 * really writes to it). So we've done our job.
+		 * If the postmaster has terminated, we've done our job.
 		 */
-		if (FD_ISSET(pmPipe, &rfds))
+		if (!PostmasterIsAlive(true))
 			exit(0);
 	}
 }

src/backend/storage/buffer/bufmgr.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.165 2004/05/08 19:09:25 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.166 2004/05/29 22:48:19 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -60,10 +60,6 @@ bool		zero_damaged_pages = false;
 bool			ShowPinTrace = false;
 #endif
 
-int			BgWriterDelay = 200;
-int			BgWriterPercent = 1;
-int			BgWriterMaxpages = 100;
-
 long		NDirectFileRead;	/* some I/O's are direct file access.
 								 * bypass bufmgr */
 long		NDirectFileWrite;	/* e.g., I/O in psort and hashjoin. */
@@ -862,72 +858,6 @@ FlushBufferPool(void)
 }
 
 
-/*
- * BufferBackgroundWriter
- *
- * Periodically flushes dirty blocks from the buffer pool to keep
- * the LRU list clean, preventing regular backends from writing.
- */
-void
-BufferBackgroundWriter(void)
-{
-	if (BgWriterPercent == 0)
-		return;
-
-	/*
-	 * Loop forever 
-	 */
-	for (;;)
-	{
-		int			n;
-		long		udelay;
-
-		/*
-		 * Call BufferSync() with instructions to keep just the
-		 * LRU heads clean.
-		 */
-		n = BufferSync(BgWriterPercent, BgWriterMaxpages);
-
-		/*
-		 * Whatever signal is sent to us, let's just die gallantly. If
-		 * it wasn't meant that way, the postmaster will reincarnate us.
-		 */
-		if (InterruptPending)
-			return;
-
-		/*
-		 * Whenever we have nothing to do, close all smgr files.  This
-		 * is so we won't hang onto smgr references to deleted files
-		 * indefinitely.  XXX this is a bogus, temporary solution.  'Twould
-		 * be much better to do this once per checkpoint, but the bgwriter
-		 * doesn't yet know anything about checkpoints.
-		 */
-		if (n == 0)
-			smgrcloseall();
-
-		/*
-		 * Nap for the configured time or sleep for 10 seconds if
-		 * there was nothing to do at all.
-		 *
-		 * On some platforms, signals won't interrupt the sleep.  To ensure
-		 * we respond reasonably promptly when the postmaster signals us,
-		 * break down the sleep into 1-second increments, and check for
-		 * interrupts after each nap.
-		 */
-		udelay = ((n > 0) ? BgWriterDelay : 10000) * 1000L;
-		while (udelay > 1000000L)
-		{
-			pg_usleep(1000000L);
-			udelay -= 1000000L;
-			if (InterruptPending)
-				return;
-		}
-		pg_usleep(udelay);
-		if (InterruptPending)
-			return;
-	}
-}
-
 /*
  * Do whatever is needed to prepare for commit at the bufmgr and smgr levels
  */

src/backend/storage/ipc/ipci.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/ipc/ipci.c,v 1.67 2004/05/28 05:13:03 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/ipc/ipci.c,v 1.68 2004/05/29 22:48:20 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,6 +18,7 @@
 #include "miscadmin.h"
 #include "access/clog.h"
 #include "access/xlog.h"
+#include "postmaster/bgwriter.h"
 #include "storage/bufmgr.h"
 #include "storage/freespace.h"
 #include "storage/ipc.h"
@@ -72,6 +73,7 @@ CreateSharedMemoryAndSemaphores(bool makePrivate,
 		size += LWLockShmemSize();
 		size += SInvalShmemSize(maxBackends);
 		size += FreeSpaceShmemSize();
+		size += BgWriterShmemSize();
 #ifdef EXEC_BACKEND
 		size += ShmemBackendArraySize();
 #endif
@@ -155,9 +157,10 @@ CreateSharedMemoryAndSemaphores(bool makePrivate,
 	InitFreeSpaceMap();
 
 	/*
-	 * Set up child-to-postmaster signaling mechanism
+	 * Set up interprocess signaling mechanisms
 	 */
 	PMSignalInit();
+	BgWriterShmemInit();
 
 #ifdef EXEC_BACKEND
 	/*

src/backend/storage/ipc/pmsignal.c

@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/ipc/pmsignal.c,v 1.13 2004/02/08 22:28:56 neilc Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/ipc/pmsignal.c,v 1.14 2004/05/29 22:48:20 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -83,3 +83,41 @@ CheckPostmasterSignal(PMSignalReason reason)
 	}
 	return false;
 }
+
+/*
+ * PostmasterIsAlive - check whether postmaster process is still alive
+ *
+ * amDirectChild should be passed as "true" by code that knows it is
+ * executing in a direct child process of the postmaster; pass "false"
+ * if an indirect child or not sure.  The "true" case uses a faster and
+ * more reliable test, so use it when possible.
+ */
+bool
+PostmasterIsAlive(bool amDirectChild)
+{
+#ifndef WIN32
+	if (amDirectChild)
+	{
+		/*
+		 * If the postmaster is alive, we'll still be its child.  If it's
+		 * died, we'll be reassigned as a child of the init process.
+		 */
+		return (getppid() == PostmasterPid);
+	}
+	else
+	{
+		/*
+		 * Use kill() to see if the postmaster is still alive.  This can
+		 * sometimes give a false positive result, since the postmaster's PID
+		 * may get recycled, but it is good enough for existing uses by
+		 * indirect children.
+		 */
+		return (kill(PostmasterPid, 0) == 0);
+	}
+#else /* WIN32 */
+	/*
+	 * XXX needs to be implemented by somebody
+	 */
+	return true;
+#endif /* WIN32 */
+}

src/backend/storage/lmgr/proc.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/lmgr/proc.c,v 1.147 2004/02/18 16:25:12 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/lmgr/proc.c,v 1.148 2004/05/29 22:48:20 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -68,10 +68,9 @@ PGPROC	   *MyProc = NULL;
  */
 NON_EXEC_STATIC slock_t *ProcStructLock = NULL;
 
+/* Pointers to shared-memory structures */
 static PROC_HDR *ProcGlobal = NULL;
-
-static PGPROC *DummyProc = NULL;
-static int	dummy_proc_type = -1;
+static PGPROC *DummyProcs = NULL;
 
 static bool waitingForLock = false;
 static bool waitingForSignal = false;
@@ -130,17 +129,16 @@ InitProcGlobal(int maxBackends)
 
 	/*
 	 * Create or attach to the PGPROC structures for dummy (checkpoint)
-	 * processes, too.	This does not get linked into the freeProcs
-	 * list.
+	 * processes, too.	These do not get linked into the freeProcs list.
 	 */
-	DummyProc = (PGPROC *)
-		ShmemInitStruct("DummyProc",sizeof(PGPROC) * NUM_DUMMY_PROCS, &foundDummy);
+	DummyProcs = (PGPROC *)
+		ShmemInitStruct("DummyProcs", sizeof(PGPROC) * NUM_DUMMY_PROCS,
+						&foundDummy);
 
 	if (foundProcGlobal || foundDummy)
 	{
 		/* both should be present or neither */
 		Assert(foundProcGlobal && foundDummy);
-		return;
 	}
 	else
 	{
@@ -170,11 +168,11 @@ InitProcGlobal(int maxBackends)
 			ProcGlobal->freeProcs = MAKE_OFFSET(proc);
 		}
 
-		MemSet(DummyProc, 0, sizeof(PGPROC) * NUM_DUMMY_PROCS);
+		MemSet(DummyProcs, 0, sizeof(PGPROC) * NUM_DUMMY_PROCS);
 		for (i = 0; i < NUM_DUMMY_PROCS; i++)
 		{
-			DummyProc[i].pid = 0;		/* marks DummyProc as not in use */
-			PGSemaphoreCreate(&(DummyProc[i].sem));
+			DummyProcs[i].pid = 0;		/* marks dummy proc as not in use */
+			PGSemaphoreCreate(&(DummyProcs[i].sem));
 		}
 
 		/* Create ProcStructLock spinlock, too */
@@ -249,7 +247,6 @@ InitProcess(void)
 	MyProc->waitHolder = NULL;
 	SHMQueueInit(&(MyProc->procHolders));
 
-
 	/*
 	 * Arrange to clean up at backend exit.
 	 */
@@ -274,6 +271,9 @@ InitProcess(void)
  * This is called by checkpoint processes so that they will have a MyProc
  * value that's real enough to let them wait for LWLocks.  The PGPROC and
  * sema that are assigned are the extra ones created during InitProcGlobal.
+ *
+ * Dummy processes are presently not expected to wait for real (lockmgr)
+ * locks, nor to participate in sinval messaging.
  */
 void
 InitDummyProcess(int proctype)
@@ -284,15 +284,15 @@ InitDummyProcess(int proctype)
 	 * ProcGlobal should be set by a previous call to InitProcGlobal (we
 	 * inherit this by fork() from the postmaster).
 	 */
-	if (ProcGlobal == NULL || DummyProc == NULL)
+	if (ProcGlobal == NULL || DummyProcs == NULL)
 		elog(PANIC, "proc header uninitialized");
 
 	if (MyProc != NULL)
 		elog(ERROR, "you already exist");
 
-	Assert(dummy_proc_type < 0);
-	dummy_proc_type = proctype;
-	dummyproc = &DummyProc[proctype];
+	Assert(proctype >= 0 && proctype < NUM_DUMMY_PROCS);
+
+	dummyproc = &DummyProcs[proctype];
 
 	/*
 	 * dummyproc should not presently be in use by anyone else
@@ -306,7 +306,7 @@ InitDummyProcess(int proctype)
 	 * Initialize all fields of MyProc, except MyProc->sem which was set
 	 * up by InitProcGlobal.
 	 */
-	MyProc->pid = MyProcPid;	/* marks DummyProc as in use by me */
+	MyProc->pid = MyProcPid;	/* marks dummy proc as in use by me */
 	SHMQueueElemInit(&(MyProc->links));
 	MyProc->errType = STATUS_OK;
 	MyProc->xid = InvalidTransactionId;
@@ -323,7 +323,7 @@ InitDummyProcess(int proctype)
 	/*
 	 * Arrange to clean up at process exit.
 	 */
-	on_shmem_exit(DummyProcKill, proctype);
+	on_shmem_exit(DummyProcKill, Int32GetDatum(proctype));
 
 	/*
 	 * We might be reusing a semaphore that belonged to a failed process.
@@ -459,13 +459,14 @@ ProcKill(int code, Datum arg)
 static void
 DummyProcKill(int code, Datum arg)
 {
+	int		proctype = DatumGetInt32(arg);
 	PGPROC	*dummyproc;
 
-	Assert(dummy_proc_type >= 0 && dummy_proc_type < NUM_DUMMY_PROCS);
+	Assert(proctype >= 0 && proctype < NUM_DUMMY_PROCS);
 
-	dummyproc = &DummyProc[dummy_proc_type];
+	dummyproc = &DummyProcs[proctype];
 
-	Assert(MyProc != NULL && MyProc == dummyproc);
+	Assert(MyProc == dummyproc);
 
 	/* Release any LW locks I am holding */
 	LWLockReleaseAll();
@@ -477,13 +478,11 @@ DummyProcKill(int code, Datum arg)
 
 	/* I can't be on regular lock queues, so needn't check */
 
-	/* Mark DummyProc no longer in use */
+	/* Mark dummy proc no longer in use */
 	MyProc->pid = 0;
 
 	/* PGPROC struct isn't mine anymore */
 	MyProc = NULL;
-
-	dummy_proc_type = -1;
 }
 
 

src/backend/tcop/postgres.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.416 2004/05/28 05:13:12 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.417 2004/05/29 22:48:20 tgl Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -110,7 +110,7 @@ static char *stack_base_ptr = NULL;
  * will reread the configuration file. (Better than doing the
  * reading in the signal handler, ey?)
  */
-static volatile bool got_SIGHUP = false;
+static volatile sig_atomic_t got_SIGHUP = false;
 
 /*
  * Flag to keep track of whether we have started a transaction.

src/backend/tcop/utility.c

@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/tcop/utility.c,v 1.217 2004/05/26 13:56:54 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/tcop/utility.c,v 1.218 2004/05/29 22:48:20 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -45,6 +45,7 @@
 #include "nodes/makefuncs.h"
 #include "parser/parse_expr.h"
 #include "parser/parse_type.h"
+#include "postmaster/bgwriter.h"
 #include "rewrite/rewriteDefine.h"
 #include "rewrite/rewriteRemove.h"
 #include "storage/fd.h"
@@ -54,7 +55,7 @@
 #include "utils/guc.h"
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"
-#include "access/xlog.h"
+
 
 /*
  * Error-checking support for DROP commands
@@ -892,7 +893,7 @@ ProcessUtility(Node *parsetree,
 				ereport(ERROR,
 						(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 						 errmsg("must be superuser to do CHECKPOINT")));
-			CreateCheckPoint(false, false);
+			RequestCheckpoint(true);
 			break;
 
 		case T_ReindexStmt:

src/backend/utils/error/elog.c

@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.138 2004/05/28 03:11:15 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.139 2004/05/29 22:48:21 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -57,6 +57,7 @@
 #include "mb/pg_wchar.h"
 #include "miscadmin.h"
 #include "pgtime.h"
+#include "postmaster/postmaster.h"
 #include "storage/ipc.h"
 #include "tcop/tcopprot.h"
 #include "utils/memutils.h"

src/backend/utils/init/globals.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/init/globals.c,v 1.88 2004/05/28 05:13:15 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/init/globals.c,v 1.89 2004/05/29 22:48:21 tgl Exp $
  *
  * NOTES
  *	  Globals used all over the place should be declared here and not
@@ -85,7 +85,10 @@ bool		enableFsync = true;
 bool		allowSystemTableMods = false;
 int			work_mem = 1024;
 int			maintenance_work_mem = 16384;
+
+/* Primary determinants of sizes of shared-memory structures: */
 int			NBuffers = 1000;
+int			MaxBackends = 100;
 
 int			VacuumCostPageHit = 1;			/* GUC parameters for vacuum */
 int			VacuumCostPageMiss = 10;

src/backend/utils/init/postinit.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/init/postinit.c,v 1.132 2004/05/27 17:12:54 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/init/postinit.c,v 1.133 2004/05/29 22:48:21 tgl Exp $
  *
  *
  *-------------------------------------------------------------------------
@@ -29,6 +29,7 @@
 #include "commands/trigger.h"
 #include "mb/pg_wchar.h"
 #include "miscadmin.h"
+#include "postmaster/postmaster.h"
 #include "storage/backendid.h"
 #include "storage/ipc.h"
 #include "storage/proc.h"

src/backend/utils/misc/guc.c

@@ -10,7 +10,7 @@
  * Written by Peter Eisentraut <peter_e@gmx.net>.
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.208 2004/05/26 15:07:39 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.209 2004/05/29 22:48:21 tgl Exp $
  *
  *--------------------------------------------------------------------
  */
@@ -44,6 +44,8 @@
 #include "optimizer/prep.h"
 #include "parser/parse_expr.h"
 #include "parser/parse_relation.h"
+#include "postmaster/bgwriter.h"
+#include "postmaster/postmaster.h"
 #include "storage/bufmgr.h"
 #include "storage/fd.h"
 #include "storage/freespace.h"
@@ -65,15 +67,10 @@
 #endif
 
 /* XXX these should appear in other modules' header files */
-extern bool Log_connections;
 extern bool Log_disconnections;
 extern DLLIMPORT bool check_function_bodies;
-extern int	PreAuthDelay;
-extern int	AuthenticationTimeout;
-extern int	CheckPointTimeout;
 extern int	CommitDelay;
 extern int	CommitSiblings;
-extern char *preload_libraries_string;
 extern int	DebugSharedBuffers;
 
 static const char *assign_log_destination(const char *value,
@@ -1262,7 +1259,7 @@ static struct config_int ConfigureNamesInt[] =
 			NULL
 		},
 		&BgWriterPercent,
-		1, 0, 100, NULL, NULL
+		1, 1, 100, NULL, NULL
 	},
 
 	{
@@ -1270,7 +1267,7 @@ static struct config_int ConfigureNamesInt[] =
 			gettext_noop("Background writer maximum number of pages to flush per round"),
 			NULL
 		},
-		&BgWriterMaxpages,
+		&BgWriterMaxPages,
 		100, 1, 1000, NULL, NULL
 	},
 

src/include/access/xlog.h

@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/xlog.h,v 1.50 2004/05/27 17:12:57 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/access/xlog.h,v 1.51 2004/05/29 22:48:22 tgl Exp $
  */
 #ifndef XLOG_H
 #define XLOG_H
@@ -207,7 +207,6 @@ extern XLogRecPtr ProcLastRecEnd;
 
 /* these variables are GUC parameters related to XLOG */
 extern int	CheckPointSegments;
-extern int	CheckPointWarning;
 extern int	XLOGbuffers;
 extern char *XLOG_sync_method;
 extern const char XLOG_sync_method_default[];

src/include/bootstrap/bootstrap.h

@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/bootstrap/bootstrap.h,v 1.34 2004/05/28 05:13:21 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/bootstrap/bootstrap.h,v 1.35 2004/05/29 22:48:22 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -58,8 +58,6 @@ extern void Int_yyerror(const char *str);
 #define BS_XLOG_NOP			0
 #define BS_XLOG_BOOTSTRAP	1
 #define BS_XLOG_STARTUP		2
-#define BS_XLOG_CHECKPOINT	3
-#define BS_XLOG_BGWRITER	4
-#define BS_XLOG_SHUTDOWN	5
+#define BS_XLOG_BGWRITER	3
 
 #endif   /* BOOTSTRAP_H */

src/include/miscadmin.h

@@ -13,11 +13,10 @@
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.161 2004/05/28 05:13:24 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.162 2004/05/29 22:48:22 tgl Exp $
  *
  * NOTES
- *	  some of the information in this file should be moved to
- *	  other files.
+ *	  some of the information in this file should be moved to other files.
  *
  *-------------------------------------------------------------------------
  */
@@ -25,6 +24,9 @@
 #define MISCADMIN_H
 
 
+#define PG_VERSIONSTR "postgres (PostgreSQL) " PG_VERSION "\n"
+
+
 /*****************************************************************************
  *	  System interrupt and critical section handling
  *
@@ -75,12 +77,15 @@ extern volatile uint32 CritSectionCount;
 extern void ProcessInterrupts(void);
 
 #ifndef WIN32
+
 #define CHECK_FOR_INTERRUPTS() \
 do { \
 	if (InterruptPending) \
 		ProcessInterrupts(); \
 } while(0)
-#else
+
+#else  /* WIN32 */
+
 #define CHECK_FOR_INTERRUPTS() \
 do { \
 	if (WaitForSingleObject(pgwin32_signal_event,0) == WAIT_OBJECT_0) \
@@ -88,7 +93,8 @@ do { \
 	if (InterruptPending) \
 		ProcessInterrupts(); \
 } while(0)
-#endif
+
+#endif /* WIN32 */
 
 
 #define HOLD_INTERRUPTS()  (InterruptHoldoffCount++)
@@ -112,20 +118,6 @@ do { \
  *	  globals.h --															 *
  *****************************************************************************/
 
-/*
- * from postmaster/postmaster.c
- */
-extern bool ClientAuthInProgress;
-
-extern int	PostmasterMain(int argc, char *argv[]);
-extern void ClosePostmasterPorts(bool pgstat_too);
-#ifdef EXEC_BACKEND
-extern pid_t postmaster_forkexec(int argc, char *argv[]);
-extern int	SubPostmasterMain(int argc, char *argv[]);
-#endif
-
-#define PG_VERSIONSTR "postgres (PostgreSQL) " PG_VERSION "\n"
-
 /*
  * from utils/init/globals.c
  */
@@ -137,6 +129,9 @@ extern bool ExitOnAnyError;
 
 extern char *DataDir;
 
+extern DLLIMPORT int NBuffers;
+extern int	MaxBackends;
+
 extern DLLIMPORT int MyProcPid;
 extern struct Port *MyProcPort;
 extern long MyCancelKey;
@@ -216,21 +211,6 @@ extern int	VacuumCostNaptime;
 extern int	VacuumCostBalance;
 extern bool	VacuumCostActive;
 
-/*
- *	A few postmaster startup options are exported here so the
- *	configuration file processor can access them.
- */
-extern bool EnableSSL;
-extern bool SilentMode;
-extern int	MaxBackends;
-extern int	ReservedBackends;
-extern DLLIMPORT int NBuffers;
-extern int	PostPortNumber;
-extern int	Unix_socket_permissions;
-extern char *Unix_socket_group;
-extern char *UnixSocketDir;
-extern char *ListenAddresses;
-
 
 /* in tcop/postgres.c */
 extern void check_stack_depth(void);

src/include/pgstat.h

@@ -5,7 +5,7 @@
  *
  *	Copyright (c) 2001-2003, PostgreSQL Global Development Group
  *
- *	$PostgreSQL: pgsql/src/include/pgstat.h,v 1.22 2004/05/28 05:13:25 tgl Exp $
+ *	$PostgreSQL: pgsql/src/include/pgstat.h,v 1.23 2004/05/29 22:48:22 tgl Exp $
  * ----------
  */
 #ifndef PGSTAT_H
@@ -349,7 +349,6 @@ extern bool pgstat_is_running;
 extern void pgstat_init(void);
 extern void pgstat_start(void);
 extern bool pgstat_ispgstat(int pid);
-extern void pgstat_close_sockets(void);
 extern void pgstat_beterm(int pid);
 
 #ifdef EXEC_BACKEND

src/include/postmaster/bgwriter.h

+/*-------------------------------------------------------------------------
+ *
+ * bgwriter.h
+ *	  Exports from postmaster/bgwriter.c.
+ *
+ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
+ *
+ * $PostgreSQL: pgsql/src/include/postmaster/bgwriter.h,v 1.1 2004/05/29 22:48:23 tgl Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef _BGWRITER_H
+#define _BGWRITER_H
+
+/* GUC options */
+extern int	BgWriterDelay;
+extern int	BgWriterPercent;
+extern int	BgWriterMaxPages;
+extern int	CheckPointTimeout;
+extern int	CheckPointWarning;
+
+extern void BackgroundWriterMain(void);
+
+extern void RequestCheckpoint(bool waitforit);
+
+extern int	BgWriterShmemSize(void);
+extern void BgWriterShmemInit(void);
+
+#endif   /* _BGWRITER_H */

src/include/postmaster/postmaster.h

+/*-------------------------------------------------------------------------
+ *
+ * postmaster.h
+ *	  Exports from postmaster/postmaster.c.
+ *
+ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * $PostgreSQL: pgsql/src/include/postmaster/postmaster.h,v 1.1 2004/05/29 22:48:23 tgl Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef _POSTMASTER_H
+#define _POSTMASTER_H
+
+/* GUC options */
+extern bool EnableSSL;
+extern bool SilentMode;
+extern int	ReservedBackends;
+extern int	PostPortNumber;
+extern int	Unix_socket_permissions;
+extern char *Unix_socket_group;
+extern char *UnixSocketDir;
+extern char *ListenAddresses;
+extern bool ClientAuthInProgress;
+extern int	PreAuthDelay;
+extern int	AuthenticationTimeout;
+extern char *preload_libraries_string;
+extern bool Log_connections;
+extern bool log_hostname;
+extern char *rendezvous_name;
+
+
+extern int	PostmasterMain(int argc, char *argv[]);
+extern void ClosePostmasterPorts(void);
+#ifdef EXEC_BACKEND
+extern pid_t postmaster_forkexec(int argc, char *argv[]);
+extern int	SubPostmasterMain(int argc, char *argv[]);
+#endif
+
+#endif   /* _POSTMASTER_H */

src/include/storage/bufmgr.h

@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/storage/bufmgr.h,v 1.79 2004/05/08 19:09:25 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/storage/bufmgr.h,v 1.80 2004/05/29 22:48:23 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -28,11 +28,6 @@ extern DLLIMPORT int NBuffers;
 /* in bufmgr.c */
 extern bool zero_damaged_pages;
 
-extern int	BgWriterDelay;
-extern int	BgWriterPercent;
-extern int	BgWriterMaxpages;
-
-
 /* in buf_init.c */
 extern DLLIMPORT Block *BufferBlockPointers;
 extern int32 *PrivateRefCount;
@@ -179,9 +174,6 @@ extern void AbortBufferIO(void);
 
 extern void BufmgrCommit(void);
 extern int	BufferSync(int percent, int maxpages);
-extern void BufferBackgroundWriter(void);
-extern const char *BgWriterAssignSyncMethod(const char *method,
-			bool doid, bool interactive);
 
 extern void InitLocalBuffer(void);
 

src/include/storage/pmsignal.h

@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/storage/pmsignal.h,v 1.7 2004/05/23 03:50:45 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/storage/pmsignal.h,v 1.8 2004/05/29 22:48:23 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,7 +22,6 @@
  */
 typedef enum
 {
-	PMSIGNAL_DO_CHECKPOINT,		/* request to start a checkpoint */
 	PMSIGNAL_PASSWORD_CHANGE,	/* pg_pwd file has changed */
 	PMSIGNAL_WAKEN_CHILDREN,	/* send a SIGUSR1 signal to all backends */
 
@@ -35,5 +34,6 @@ typedef enum
 extern void PMSignalInit(void);
 extern void SendPostmasterSignal(PMSignalReason reason);
 extern bool CheckPostmasterSignal(PMSignalReason reason);
+extern bool PostmasterIsAlive(bool amDirectChild);
 
 #endif   /* PMSIGNAL_H */

src/include/tcop/tcopprot.h

@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/tcop/tcopprot.h,v 1.65 2004/04/11 00:54:45 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/tcop/tcopprot.h,v 1.66 2004/05/29 22:48:23 tgl Exp $
  *
  * OLD COMMENTS
  *	  This file was created so that other c files could get the two
@@ -30,9 +30,7 @@ extern DLLIMPORT sigjmp_buf Warn_restart;
 extern bool Warn_restart_ready;
 extern bool InError;
 extern CommandDest whereToSendOutput;
-extern bool log_hostname;
 extern DLLIMPORT const char *debug_query_string;
-extern char *rendezvous_name;
 extern int	max_stack_depth;
 extern bool in_fatal_exit;