New ps display code, works on more platforms.

Install a default configuration file.

Clean up some funny business in the config file code.

src/backend/Makefile

@@ -34,7 +34,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.52 2000/05/31 00:28:13 petere Exp $
+#    $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.53 2000/06/04 01:44:28 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -205,7 +205,8 @@ endif
 install-templates: $(TEMPLATEDIR) \
          global1.bki.source local1_template1.bki.source \
          global1.description local1_template1.description \
-         libpq/pg_hba.conf.sample libpq/pg_ident.conf.sample
+         libpq/pg_hba.conf.sample libpq/pg_ident.conf.sample \
+         utils/misc/postgresql.conf.sample
 	$(INSTALL) $(INSTLOPTS) global1.bki.source \
 	  $(TEMPLATEDIR)/global1.bki.source
 	$(INSTALL) $(INSTLOPTS) global1.description \
@@ -218,6 +219,8 @@ install-templates: $(TEMPLATEDIR) \
 	  $(TEMPLATEDIR)/pg_hba.conf.sample
 	$(INSTALL) $(INSTLOPTS) libpq/pg_ident.conf.sample \
 	  $(TEMPLATEDIR)/pg_ident.conf.sample
+	$(INSTALL) $(INSTLOPTS) utils/misc/postgresql.conf.sample \
+	  $(TEMPLATEDIR)/postgresql.conf.sample
 
 install-headers: prebuildheaders $(SRCDIR)/include/config.h
 	-@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi

src/backend/commands/async.c

@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.62 2000/05/31 00:28:15 petere Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.63 2000/06/04 01:44:29 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -771,7 +771,7 @@ ProcessIncomingNotify(void)
 	if (Trace_notify)
 		elog(DEBUG, "ProcessIncomingNotify");
 
-	PS_SET_STATUS("async_notify");
+	set_ps_display("async_notify");
 
 	notifyInterruptOccurred = 0;
 
@@ -841,7 +841,7 @@ ProcessIncomingNotify(void)
 	 */
 	pq_flush();
 
-	PS_SET_STATUS("idle");
+	set_ps_display("idle");
 
 	if (Trace_notify)
 		elog(DEBUG, "ProcessIncomingNotify: done");

src/backend/libpq/pqcomm.c

@@ -29,7 +29,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: pqcomm.c,v 1.94 2000/06/02 15:57:21 momjian Exp $
+ *	$Id: pqcomm.c,v 1.95 2000/06/04 01:44:30 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -182,12 +182,11 @@ StreamDoUnlink()
  */
 
 int
-StreamServerPort(char *hostName, unsigned short portName, int *fdP)
+StreamServerPort(int family, unsigned short portName, int *fdP)
 {
 	SockAddr	saddr;
 	int			fd,
-				err,
-				family;
+				err;
 	size_t		len;
 	int			one = 1;
 
@@ -196,7 +195,7 @@ StreamServerPort(char *hostName, unsigned short portName, int *fdP)
 
 #endif
 
-	family = ((hostName != NULL) ? AF_INET : AF_UNIX);
+	Assert(family == AF_INET || family == AF_UNIX);
 
 	if ((fd = socket(family, SOCK_STREAM, 0)) < 0)
 	{

src/backend/postmaster/postmaster.c

@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.145 2000/06/02 15:57:22 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.146 2000/06/04 01:44:31 petere Exp $
  *
  * NOTES
  *
@@ -33,6 +33,8 @@
  *
  *-------------------------------------------------------------------------
  */
+#include "postgres.h"
+
 #include <unistd.h>
 #include <signal.h>
 #include <sys/wait.h>
@@ -46,16 +48,11 @@
 #include <time.h>
 #include <sys/param.h>
 
-#include "postgres.h"
  /* moved here to prevent double define */
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif
 
-#ifndef MAXHOSTNAMELEN
-#define MAXHOSTNAMELEN 256
-#endif
-
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #else
@@ -72,10 +69,6 @@
 #include "getopt.h"
 #endif
 
-#ifndef HAVE_GETHOSTNAME
-#include "port-protos.h"
-#endif
-
 #include "commands/async.h"
 #include "lib/dllist.h"
 #include "libpq/auth.h"
@@ -191,8 +184,6 @@ static volatile bool got_SIGHUP = false;
 /*
  * Default Values
  */
-static char Execfile[MAXPGPATH];
-
 static int	ServerSock_INET = INVALID_SOCK;		/* stream socket server */
 
 #if !defined(__CYGWIN32__) && !defined(__QNX__)
@@ -278,7 +269,7 @@ static void SignalChildren(SIGNAL_ARGS);
 static int	CountChildren(void);
 static int
 SetOptsFile(char *progname, int port, char *datadir,
-			int assert, int nbuf, char *execfile,
+			int assert, int nbuf,
 			int debuglvl, int netserver,
 #ifdef USE_SSL
 			int securenetserver,
@@ -368,61 +359,17 @@ int
 PostmasterMain(int argc, char *argv[])
 {
 	int			opt;
-	char	   *hostName;
 	int			status;
 	int			silentflag = 0;
 	bool		DataDirOK;		/* We have a usable PGDATA value */
-	char		hostbuf[MAXHOSTNAMELEN];
-	int			nonblank_argc;
 	char		original_extraoptions[MAXPGPATH];
 
 	*original_extraoptions = '\0';
 
-#ifndef HAVE_SETPROCTITLE
-	/*
-	 * We need four params so we can display status.  If we don't get
-	 * them from the user, let's make them ourselves.
-	 */
-	if (argc < 5)
-	{
-		int			i;
-		char	   *new_argv[6];
-
-		for (i = 0; i < argc; i++)
-			new_argv[i] = argv[i];
-		for (; i < 5; i++)
-			new_argv[i] = "";
-		new_argv[5] = NULL;
-
-		if (!Execfile[0] && FindExec(Execfile, argv[0], "postmaster") < 0)
-		{
-			fprintf(stderr, "%s: could not find postmaster to execute...\n",
-					argv[0]);
-			exit(1);
-		}
-		new_argv[0] = Execfile;
-
-		execv(new_argv[0], new_argv);
-
-		/* How did we get here?  Error! */
-		perror(new_argv[0]);
-		fprintf(stderr, "PostmasterMain execv failed on %s\n", argv[0]);
-		exit(1);
-	}
-#endif
-
 	progname = argv[0];
 	real_argv = argv;
 	real_argc = argc;
 
-	/*
-	 * don't process any dummy args we placed at the end for status
-	 * display
-	 */
-	for (nonblank_argc = argc; nonblank_argc > 0; nonblank_argc--)
-		if (argv[nonblank_argc - 1] != NULL && argv[nonblank_argc - 1][0] != '\0')
-			break;
-
 	/*
 	 * for security, no dir or file created can be group or other
 	 * accessible
@@ -431,13 +378,6 @@ PostmasterMain(int argc, char *argv[])
 
 	ResetAllOptions();
 
-	if (!(hostName = getenv("PGHOST")))
-	{
-		if (gethostname(hostbuf, MAXHOSTNAMELEN) < 0)
-			strcpy(hostbuf, "localhost");
-		hostName = hostbuf;
-	}
-
 	MyProcPid = getpid();
 	DataDir = getenv("PGDATA"); /* default value */
 
@@ -455,7 +395,7 @@ PostmasterMain(int argc, char *argv[])
 	 * will occur.
 	 */
 	opterr = 1;
-	while ((opt = getopt(nonblank_argc, argv, "A:a:B:b:D:d:Film:MN:no:p:Ss-:")) != EOF)
+	while ((opt = getopt(argc, argv, "A:a:B:b:D:d:Film:MN:no:p:Ss-:")) != EOF)
 	{
 		if (opt == 'D')
 			DataDir = optarg;
@@ -472,7 +412,7 @@ PostmasterMain(int argc, char *argv[])
 	ProcessConfigFile(PGC_POSTMASTER);
 
 	IgnoreSystemIndexes(false);
-	while ((opt = getopt(nonblank_argc, argv, "A:a:B:b:D:d:Film:MN:no:p:Ss-:")) != EOF)
+	while ((opt = getopt(argc, argv, "A:a:B:b:D:d:Film:MN:no:p:Ss-:")) != EOF)
 	{
 		switch (opt)
 		{
@@ -496,15 +436,7 @@ PostmasterMain(int argc, char *argv[])
 				NBuffers = atoi(optarg);
 				break;
 			case 'b':
-				/* Set the backend executable file to use. */
-				if (!ValidateBinary(optarg))
-					StrNCpy(Execfile, optarg, MAXPGPATH);
-				else
-				{
-					fprintf(stderr, "%s: invalid backend \"%s\"\n",
-							progname, optarg);
-					exit(2);
-				}
+				/* Can no longer set the backend executable file to use. */
 				break;
 			case 'D':
 				/* already done above */
@@ -630,13 +562,6 @@ PostmasterMain(int argc, char *argv[])
 		exit(1);
 	}
 
-	if (!Execfile[0] && FindExec(Execfile, argv[0], "postgres") < 0)
-	{
-		fprintf(stderr, "%s: could not find backend to execute...\n",
-				argv[0]);
-		exit(1);
-	}
-
 #ifdef USE_SSL
 	if (!NetServer && SecureNetServer)
 	{
@@ -649,7 +574,7 @@ PostmasterMain(int argc, char *argv[])
 
 	if (NetServer)
 	{
-		status = StreamServerPort(hostName, (unsigned short)PostPortName, &ServerSock_INET);
+		status = StreamServerPort(AF_INET, (unsigned short)PostPortName, &ServerSock_INET);
 		if (status != STATUS_OK)
 		{
 			fprintf(stderr, "%s: cannot create INET stream port\n",
@@ -659,7 +584,7 @@ PostmasterMain(int argc, char *argv[])
 	}
 
 #if !defined(__CYGWIN32__) && !defined(__QNX__)
-	status = StreamServerPort(NULL, (unsigned short)PostPortName, &ServerSock_UNIX);
+	status = StreamServerPort(AF_UNIX, (unsigned short)PostPortName, &ServerSock_UNIX);
 	if (status != STATUS_OK)
 	{
 		fprintf(stderr, "%s: cannot create UNIX stream port\n",
@@ -696,7 +621,6 @@ PostmasterMain(int argc, char *argv[])
 							assert_enabled,		/* whether -A is specified
 												 * or not */
 							NBuffers,	/* -B: number of shared buffers */
-							Execfile,	/* -b: postgres executable file */
 							DebugLvl,	/* -d: debug level */
 							NetServer,	/* -i: accept connection from INET */
 #ifdef USE_SSL
@@ -785,7 +709,6 @@ pmdaemonize(char *extraoptions)
 							assert_enabled,		/* whether -A is specified
 												 * or not */
 							NBuffers,	/* -B: number of shared buffers */
-							Execfile,	/* -b: postgres executable file */
 							DebugLvl,	/* -d: debug level */
 							NetServer,	/* -i: accept connection from INET */
 #ifdef USE_SSL
@@ -1905,7 +1828,6 @@ DoBackend(Port *port)
 {
 	char	   *av[ARGV_SIZE * 2];
 	int			ac = 0;
-	char		execbuf[MAXPGPATH];
 	char		debugbuf[ARGV_SIZE];
 	char		protobuf[ARGV_SIZE];
 	char		dbbuf[ARGV_SIZE];
@@ -1958,26 +1880,7 @@ DoBackend(Port *port)
 	 * ----------------
 	 */
 
-	StrNCpy(execbuf, Execfile, MAXPGPATH);
-	av[ac++] = execbuf;
-
-	/*
-	 * We need to set our argv[0] to an absolute path name because some
-	 * OS's use this for dynamic loading, like BSDI.  Without it, when we
-	 * change directories to the database dir, the dynamic loader can't
-	 * find the base executable and fails. Another advantage is that this
-	 * changes the 'ps' displayed process name on some platforms.  It does
-	 * on BSDI.  That's a big win.
-	 */
-
-#ifndef linux
-
-	/*
-	 * This doesn't work on linux and overwrites the only valid pointer to
-	 * the argv buffer.  See PS_INIT_STATUS macro.
-	 */
-	real_argv[0] = Execfile;
-#endif
+	av[ac++] = "postgres";
 
 	/*
 	 * Pass the requested debugging level along to the backend. Level one
@@ -2229,7 +2132,6 @@ SSDataBase(bool startup)
 	{
 		char	   *av[ARGV_SIZE * 2];
 		int			ac = 0;
-		char		execbuf[MAXPGPATH];
 		char		nbbuf[ARGV_SIZE];
 		char		dbbuf[ARGV_SIZE];
 
@@ -2244,8 +2146,7 @@ SSDataBase(bool startup)
 		ServerSock_UNIX = INVALID_SOCK;
 #endif
 
-		StrNCpy(execbuf, Execfile, MAXPGPATH);
-		av[ac++] = execbuf;
+		av[ac++] = "postgres";
 
 		av[ac++] = "-d";
 
@@ -2294,7 +2195,7 @@ SSDataBase(bool startup)
  */
 static int
 SetOptsFile(char *progname, int port, char *datadir,
-			int assert, int nbuf, char *execfile,
+			int assert, int nbuf,
 			int debuglvl, int netserver,
 #ifdef USE_SSL
 			int securenetserver,
@@ -2324,7 +2225,7 @@ SetOptsFile(char *progname, int port, char *datadir,
 		strcat(opts, buf);
 	}
 
-	snprintf(buf, sizeof(buf), "-B %d\n-b %s\n", nbuf, execfile);
+	snprintf(buf, sizeof(buf), "-B %d\n", nbuf);
 	strcat(opts, buf);
 
 	if (debuglvl)

src/backend/storage/lmgr/lock.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.68 2000/05/31 00:28:30 petere Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.69 2000/06/04 01:44:32 petere Exp $
  *
  * NOTES
  *	  Outside modules can create a lock table and acquire/release
@@ -895,8 +895,7 @@ WaitOnLock(LOCKMETHOD lockmethod, LOCK *lock, LOCKMODE lockmode)
 {
 	PROC_QUEUE *waitQueue = &(lock->waitProcs);
 	LOCKMETHODTABLE *lockMethodTable = LockMethodTable[lockmethod];
-	char		old_status[64],
-				new_status[64];
+	char		*new_status, *old_status;
 
 	Assert(lockmethod < NumLockMethods);
 
@@ -909,10 +908,13 @@ WaitOnLock(LOCKMETHOD lockmethod, LOCK *lock, LOCKMODE lockmode)
 	 * people can be deleted from the queue by a SIGINT or something.
 	 */
 	LOCK_PRINT("WaitOnLock: sleeping on lock", lock, lockmode);
-	strcpy(old_status, PS_STATUS);
-	strcpy(new_status, PS_STATUS);
+
+	old_status = pstrdup(get_ps_display());
+	new_status = palloc(strlen(get_ps_display()) + 10);
+	strcpy(new_status, get_ps_display());
 	strcat(new_status, " waiting");
-	PS_SET_STATUS(new_status);
+	set_ps_display(new_status);
+
 	if (ProcSleep(waitQueue,
 				  lockMethodTable->ctl,
 				  lockmode,
@@ -940,7 +942,11 @@ WaitOnLock(LOCKMETHOD lockmethod, LOCK *lock, LOCKMODE lockmode)
 
 	if (lock->activeHolders[lockmode] == lock->holders[lockmode])
 		lock->waitMask &= BITS_OFF[lockmode];
-	PS_SET_STATUS(old_status);
+
+	set_ps_display(old_status);
+	pfree(old_status);
+	pfree(new_status);
+
 	LOCK_PRINT("WaitOnLock: wakeup on lock", lock, lockmode);
 	return STATUS_OK;
 }

src/backend/tcop/postgres.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.157 2000/05/31 00:28:31 petere Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.158 2000/06/04 01:44:33 petere Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -79,10 +79,6 @@ bool Log_connections = false;
 
 CommandDest whereToSendOutput = Debug;
 
-/* Define status buffer needed by PS_SET_STATUS */
-#ifdef PS_DEFINE_BUFFER
-PS_DEFINE_BUFFER;
-#endif
 
 extern void BaseInit(void);
 extern void StartupXLOG(void);
@@ -815,10 +811,8 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
 	StringInfo	parser_input;
 	char	   *userName;
 
-	/* Used if verbose is set, must be initialized */
-	char	   *remote_info = "interactive";
-	char	   *remote_host = "";
-	unsigned short remote_port = 0;
+	char	   *remote_host;
+	unsigned short remote_port;
 
 	extern int	optind;
 	extern char *optarg;
@@ -1173,6 +1167,12 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
 		proc_exit(1);
 	}
 
+	/*
+	 * Make a copy of DataDir because the arguments and environment
+	 * might be moved around later on.
+	 */
+	DataDir = strdup(DataDir);
+
 	/*
 	 * 1. Set BlockSig and UnBlockSig masks. 2. Set up signal handlers. 3.
 	 * Allow only SIGUSR1 signal (we never block it) during
@@ -1281,55 +1281,56 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
 #endif
 
 	/* On some systems our dynloader code needs the executable's pathname */
-	if (FindExec(pg_pathname, argv[0], "postgres") < 0)
+	if (FindExec(pg_pathname, real_argv[0], "postgres") < 0)
 		elog(FATAL, "%s: could not locate executable, bailing out...",
-			 argv[0]);
+			 real_argv[0]);
 
 	/*
 	 * Find remote host name or address.
 	 */
+	remote_host = NULL;
+
 	if (IsUnderPostmaster)
 	{
-		switch (MyProcPort->raddr.sa.sa_family)
+		if (MyProcPort->raddr.sa.sa_family == AF_INET)
 		{
-				struct hostent *host_ent;
+			struct hostent *host_ent;
+			char * host_addr;
 
-			case AF_INET:
-				remote_info = remote_host = malloc(48);
-				remote_port = ntohs(MyProcPort->raddr.in.sin_port);
-				strcpy(remote_host, inet_ntoa(MyProcPort->raddr.in.sin_addr));
-				if (HostnameLookup)
-				{
-					host_ent = \
-						gethostbyaddr((char *) &MyProcPort->raddr.in.sin_addr,
-								   sizeof(MyProcPort->raddr.in.sin_addr),
-									  AF_INET);
-					if (host_ent)
-					{
-						strncpy(remote_host, host_ent->h_name, 48);
-						*(remote_host + 47) = '\0';
-					}
-				}
-				if (ShowPortNumber)
+			remote_port = ntohs(MyProcPort->raddr.in.sin_port);
+			host_addr = inet_ntoa(MyProcPort->raddr.in.sin_addr);
+
+			if (HostnameLookup)
+			{
+				host_ent = gethostbyaddr((char *) &MyProcPort->raddr.in.sin_addr, sizeof(MyProcPort->raddr.in.sin_addr), AF_INET);
+
+				if (host_ent)
 				{
-					remote_info = malloc(strlen(remote_host) + 6);
-					sprintf(remote_info, "%s:%d", remote_host, remote_port);
+					remote_host = palloc(strlen(host_addr) + strlen(host_ent->h_name) + 3);
+					sprintf(remote_host, "%s[%s]", host_ent->h_name, host_addr);
 				}
-				break;
-			case AF_UNIX:
-				remote_info = remote_host = "localhost";
-				break;
-			default:
-				remote_info = remote_host = "unknown";
-				break;
+			}
+
+			if (remote_host == NULL)
+				remote_host = pstrdup(host_addr);
+
+			if (ShowPortNumber)
+			{
+				char * str = palloc(strlen(remote_host) + 7);
+				sprintf(str, "%s:%hu", remote_host, remote_port);
+				pfree(remote_host);
+				remote_host = str;
+			}
 		}
+		else /* not AF_INET */
+			remote_host = "[local]";
+
 
 		/*
 		 * Set process params for ps
 		 */
-		PS_INIT_STATUS(real_argc, real_argv, argv[0],
-					   remote_info, userName, DBName);
-		PS_SET_STATUS("startup");
+		init_ps_display(real_argc, real_argv, userName, DBName, remote_host);
+		set_ps_display("startup");
 	}
 
 	if (Log_connections)
@@ -1378,7 +1379,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
 	if (!IsUnderPostmaster)
 	{
 		puts("\nPOSTGRES backend interactive interface ");
-		puts("$Revision: 1.157 $ $Date: 2000/05/31 00:28:31 $\n");
+		puts("$Revision: 1.158 $ $Date: 2000/06/04 01:44:33 $\n");
 	}
 
 	/*
@@ -1422,7 +1423,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
 
 	for (;;)
 	{
-		PS_SET_STATUS("idle");
+		set_ps_display("idle");
 
 		/* XXX this could be moved after ReadCommand below to get more
 		 * sensical behaviour */
@@ -1565,7 +1566,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
 		{
 			if (DebugLvl >= 1)
 				elog(DEBUG, "CommitTransactionCommand");
-			PS_SET_STATUS("commit");
+			set_ps_display("commit");
 			CommitTransactionCommand();
 #ifdef SHOW_MEMORY_STATS
 			/* print global-context stats at each commit for leak tracking */

src/backend/tcop/pquery.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.30 2000/01/26 05:57:07 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.31 2000/06/04 01:44:33 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -204,7 +204,7 @@ ProcessQueryDesc(QueryDesc *queryDesc, Node *limoffset, Node *limcount)
 	plan = queryDesc->plantree;
 
 	operation = queryDesc->operation;
-	PS_SET_STATUS(tag = CreateOperationTag(operation));
+	set_ps_display(tag = CreateOperationTag(operation));
 	dest = queryDesc->dest;
 
 	/* ----------------

src/backend/utils/misc/Makefile

@@ -4,14 +4,14 @@
 #    Makefile for utils/misc
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/misc/Makefile,v 1.15 2000/06/01 14:52:25 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/misc/Makefile,v 1.16 2000/06/04 01:44:34 petere Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR = ../../..
 include $(SRCDIR)/Makefile.global
 
-OBJS = database.o superuser.o guc.o guc-file.o
+OBJS = database.o superuser.o guc.o guc-file.o ps_status.o
 
 all: SUBSYS.o
 

src/backend/utils/misc/guc-file.l

@@ -4,7 +4,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc-file.l,v 1.2 2000/06/01 16:46:50 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc-file.l,v 1.3 2000/06/04 01:44:34 petere Exp $
  */
 
 %{
@@ -22,6 +22,8 @@
 #include "utils/elog.h"
 #include "utils/guc.h"
 
+#define CONFIG_FILENAME "postgresql.conf"
+
 static unsigned ConfigFileLineno;
 
 enum {
@@ -41,6 +43,9 @@ enum {
 #define YY_USER_INIT (ConfigFileLineno = 1)
 #define YY_NO_UNPUT
 
+/* prototype, so compiler is happy with our high warnings setting */
+int GUC_yylex(void);
+
 %}
 
 SIGN            ("-"|"+")
@@ -141,13 +146,13 @@ ProcessConfigFile(GucContext context)
 	/*
 	 * Open file
 	 */
-	filename = malloc(strlen(DataDir) + 16);
+	filename = malloc(strlen(DataDir) + strlen(CONFIG_FILENAME) + 2);
 	if (filename == NULL)
 	{
 		elog(elevel, "out of memory");
 		return;
 	}
-	sprintf(filename, "%s/configuration", DataDir);
+	sprintf(filename, "%s/" CONFIG_FILENAME, DataDir);
 
     fp = AllocateFile(filename, "r");
     if (!fp)
@@ -155,7 +160,7 @@ ProcessConfigFile(GucContext context)
 		free(filename);
         /* File not found is fine */
         if (errno != ENOENT)
-            elog(elevel, "could not read configuration: %s", strerror(errno));
+            elog(elevel, "could not read configuration file `" CONFIG_FILENAME "': %s", strerror(errno));
 		return;
     }
 
@@ -166,7 +171,7 @@ ProcessConfigFile(GucContext context)
 	{
 		FreeFile(fp);
 		free(filename);
-        elog(elevel, "could not stat configuration file: %s", strerror(errno));
+        elog(elevel, "could not stat configuration file `" CONFIG_FILENAME "': %s", strerror(errno));
 		return;
 	}
 
@@ -174,7 +179,7 @@ ProcessConfigFile(GucContext context)
 	{
 		FreeFile(fp);
 		free(filename);
-        elog(elevel, "configuration file has wrong permissions");
+        elog(elevel, "configuration file `" CONFIG_FILENAME "' has wrong permissions");
 		return;
 	}
 
@@ -261,8 +266,7 @@ ProcessConfigFile(GucContext context)
 	FreeFile(fp);
 	free(filename);
 	free_name_value_list(head);
-	elog(elevel, "%s:%u: syntax error (ps:%d, t:%d)", filename,
-		 ConfigFileLineno, parse_state, token);
+	elog(elevel, CONFIG_FILENAME ":%u: syntax error", ConfigFileLineno);
 	return;
 
  out_of_memory:

src/backend/utils/misc/postgresql.conf.sample

+#
+# PostgreSQL configuration file
+# -----------------------------
+#
+# This file consists of lines of the form
+#
+#   name = value
+#
+# (The `=' is optional.) White space is collapsed, comments are
+# introduced by `#' anywhere on a line. The complete list of option
+# names and allowed values can be found in the PostgreSQL
+# documentation. Examples are:
+
+#log_connections = on
+#fsync = off
+#max_backends = 64
+
+# Any option can also be given as a command line switch to the
+# postmaster, e.g., `postmaster --log-connections=on'. Some options
+# can be set at run-time with the `SET' SQL command.

src/backend/utils/misc/ps_status.c

+/*--------------------------------------------------------------------
+ * ps_status.c
+ *
+ * Routines to support changing the ps display of PostgreSQL backends
+ * to contain some useful information. Differs wildly across
+ * platforms.
+ *
+ * $Header: /cvsroot/pgsql/src/backend/utils/misc/ps_status.c,v 1.1 2000/06/04 01:44:34 petere Exp $
+ *
+ * Copyright 2000 by PostgreSQL Global Development Group
+ * various details abducted from various places
+ *--------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include <unistd.h>
+
+
+#ifdef HAVE_SYS_PSTAT_H
+# include <sys/pstat.h>			/* for HP-UX */
+#endif
+#ifdef HAVE_MACHINE_VMPARAM_H
+# include <machine/vmparam.h>	/* for old BSD */
+#endif
+#ifdef HAVE_SYS_EXEC_H
+# include <sys/exec.h>			/* for old BSD */
+#endif
+
+#include "miscadmin.h"
+
+#include "utils/ps_status.h"
+
+extern char **environ;
+
+
+/*------
+ * Alternative ways of updating ps display:
+ *
+ * PS_USE_SETPROCTITLE
+ *     use the function setproctitle(const char *, ...)
+ *     (newer BSD systems)
+ * PS_USE_PSTAT
+ *     use the pstat(PSTAT_SETCMD, )
+ *     (HPUX)
+ * PS_USE_PS_STRINGS
+ *     assign PS_STRINGS->ps_argvstr = "string"
+ *     (some BSD systems)
+ * PS_USE_CHANCE_ARGV
+ *     assign argv[0] = "string"
+ *     (some other BSD systems)
+ * PS_USE_CLOBBER_ARGV
+ *     write over the argv and environment area
+ *     (most SysV-like systems)
+ * PS_USE_NONE
+ *     don't update ps display
+ *     (This is the default, as it is safest.)
+ */
+#if defined(HAVE_SETPROCTITLE)
+# define PS_USE_SETPROCTITLE
+#elif defined(HAVE_PSTAT) && defined(PSTAT_SETCMD)
+# define PS_USE_PSTAT
+#elif defined(HAVE_PS_STRINGS)
+# define PS_USE_PS_STRINGS 
+#elif defined(BSD) || defined(__bsdi__) || defined(__hurd__)
+# define PS_USE_CHANGE_ARGV
+#elif defined(__linux__) || defined(_AIX4) || defined(_AIX3) || defined(__sgi) || (defined(sun) && !defined(BSD)) || defined(ultrix) || defined(__ksr__) || defined(__osf__) || defined(__QNX__) || defined(__svr4__) || defined(__svr5__)
+# define PS_USE_CLOBBER_ARGV
+#else
+# define PS_USE_NONE
+#endif
+
+
+/* Different systems want the buffer padded differently */
+#if defined(_AIX3) || defined(__linux__) || defined(__QNX__) || defined(__svr4__)
+# define PS_PADDING '\0'
+#else
+# define PS_PADDING ' '
+#endif
+
+
+#ifndef PS_USE_CLOBBER_ARGV
+/* all but one options need a buffer to write their ps line in */
+#define PS_BUFFER_SIZE 256
+static char ps_buffer[PS_BUFFER_SIZE];
+static const size_t ps_buffer_size = PS_BUFFER_SIZE;
+
+#else  /* PS_USE_CLOBBER_ARGV */
+static char * ps_buffer; /* will point to argv area */
+static size_t ps_buffer_size; /* space determined at run time */
+#endif /* PS_USE_CLOBBER_ARGV */
+
+static size_t ps_buffer_fixed_size; /* size of the constant prefix */
+
+
+
+/*
+ * Call this once at backend start.
+ */
+void
+init_ps_display(int argc, char *argv[],
+				const char * username, const char * dbname,
+				const char * host_info)
+{
+#ifndef PS_USE_NONE
+    Assert(username);
+    Assert(dbname);
+
+	/* no ps display for stand-alone backend */
+    if (!IsUnderPostmaster)
+        return;
+
+# ifdef PS_USE_CHANGE_ARGV
+	argv[0] = ps_buffer;
+	argv[1] = NULL;
+# endif /* PS_USE_CHANGE_ARGV */
+
+# ifdef PS_USE_CLOBBER_ARGV
+    /*
+     * If we're going to overwrite the argv area, count the space.
+     */
+	{
+		char * end_of_area = NULL;
+		char **new_environ;
+		int i;
+
+		/*
+		 * check for contiguous argv strings
+		 */
+		for (i = 0; i < argc; i++)
+			if (i == 0 || end_of_area + 1 == argv[i])
+				end_of_area = argv[i] + strlen(argv[i]);
+
+		/*
+		 * check for contiguous environ strings following argv
+		 */
+		for (i = 0; end_of_area != NULL && environ[i] != NULL; i++)
+			if (end_of_area + 1 == environ[i])
+				end_of_area = environ[i] + strlen(environ[i]);
+
+		if (end_of_area == NULL)
+		{
+			ps_buffer = NULL;
+			ps_buffer_size = 0;
+		}
+		else
+		{
+			ps_buffer = argv[0];
+			ps_buffer_size = end_of_area - argv[0] - 1;
+		}
+		argv[1] = NULL;
+
+		/*
+		 * move the environment out of the way
+		 */
+		for (i = 0; environ[i] != NULL; i++)
+			;
+		new_environ = malloc(sizeof (char *) * (i + 1));
+		for (i = 0; environ[i] != NULL; i++)
+		new_environ[i] = strdup(environ[i]);
+		new_environ[i] = NULL;
+		environ = new_environ;
+	}
+# endif /* PS_USE_CLOBBER_ARGV */
+
+	/*
+	 * Make fixed prefix
+	 */
+# ifdef PS_USE_SETPROCTITLE
+	/* apparently setproctitle() already adds a `progname:' prefix to
+	 * the ps line */
+	snprintf(ps_buffer, ps_buffer_size,
+			 "%s %s %s ",
+			 username, dbname, host_info);
+# else
+	snprintf(ps_buffer, ps_buffer_size,
+			 "postgres: %s %s %s ",
+			 username, dbname, host_info);
+# endif
+
+    ps_buffer_fixed_size = strlen(ps_buffer);
+#endif /* not PS_USE_NONE */
+}
+
+
+
+/*
+ * Call this to update the ps status display to a fixed prefix plus an
+ * indication of what you're currently doing passed in the argument.
+ */
+void
+set_ps_display(const char * value)
+{
+	/* no ps display for stand-alone backend */
+	if (!IsUnderPostmaster)
+		return;
+
+#ifndef PS_USE_NONE
+	if (!ps_buffer)
+		return;
+# ifdef PS_USE_SETPROCTITLE
+	setproctitle("%s%s", ps_buffer, value);
+
+# else /* not PS_USE_SETPROCTITLE */
+	{
+		size_t vallen = strlen(value);
+
+		strncpy(ps_buffer + ps_buffer_fixed_size, value,
+				ps_buffer_size - ps_buffer_fixed_size);
+
+		if (ps_buffer_fixed_size + vallen >= ps_buffer_size)
+			ps_buffer[ps_buffer_size - 1] = 0;
+		else
+			ps_buffer[ps_buffer_fixed_size + vallen] = 0;
+
+#  ifdef PS_USE_PSTAT
+		{
+			union pstun pst;
+
+			pst.pst_command = ps_buffer;
+			pstat(PSTAT_SETCMD, pst, strlen(ps_buffer), 0, 0);
+		}
+#  endif /* PS_USE_PSTAT */
+
+#  ifdef PS_USE_PS_STRINGS
+		PS_STRINGS->ps_nargvstr = 1;
+		PS_STRINGS->ps_argvstr = ps_buffer;
+#  endif /* PS_USE_PS_STRINGS */
+
+#  ifdef PS_USE_CLOBBER_ARGV
+		{
+			char * cp;
+			/* pad unused memory */
+			for(cp = ps_buffer + ps_buffer_fixed_size + vallen;
+				cp < ps_buffer + ps_buffer_size;
+				cp++)
+				*cp = PS_PADDING;
+		}
+#  endif /* PS_USE_CLOBBER_ARGV */
+	}
+# endif /* not USE_SETPROCTITLE */
+#endif /* not PS_USE_NONE */
+}
+
+
+/*
+ * Returns what's currently in the ps display, in case someone needs
+ * it.
+ */
+const char *
+get_ps_display(void)
+{
+	return ps_buffer + ps_buffer_fixed_size;
+}

src/bin/initdb/initdb.sh

@@ -26,7 +26,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.92 2000/05/31 00:28:35 petere Exp $
+#    $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.93 2000/06/04 01:44:35 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -318,10 +318,10 @@ fi
 TEMPLATE="$PGLIB"/local1_template1.bki.source
 GLOBAL="$PGLIB"/global1.bki.source
 PG_HBA_SAMPLE="$PGLIB"/pg_hba.conf.sample
+POSTGRESQL_CONF_SAMPLE="$PGLIB"/postgresql.conf.sample
 
 TEMPLATE_DESCR="$PGLIB"/local1_template1.description
 GLOBAL_DESCR="$PGLIB"/global1.description
-PG_POSTMASTER_OPTS_DEFAULT_SAMPLE="$PGLIB"/postmaster.opts.default.sample
 
 if [ "$show_setting" -eq 1 ]
 then
@@ -339,9 +339,9 @@ then
  	echo "  TEMPLATE:       $TEMPLATE"	 
 	echo "  GLOBAL:         $GLOBAL"
 	echo "  PG_HBA_SAMPLE:  $PG_HBA_SAMPLE"
+        echo "  POSTGRESQL_CONF_SAMPLE: $POSTGRESQL_CONF_SAMPLE"
 	echo "  TEMPLATE_DESCR: $TEMPLATE_DESCR"
 	echo "  GLOBAL_DESCR:   $GLOBAL_DESCR"
-	echo "  PG_POSTMASTER_OPTS_DEFAULT_SAMPLE: $PG_POSTMASTER_OPTS_DEFAULT_SAMPLE"
 	echo 
 	exit 0
 fi
@@ -459,7 +459,7 @@ then
     "$PGPATH"/pg_version "$PGDATA" || exit_nicely
 
     cp "$PG_HBA_SAMPLE" "$PGDATA"/pg_hba.conf     || exit_nicely
-    cp "$PG_POSTMASTER_OPTS_DEFAULT_SAMPLE" "$PGDATA"/postmaster.opts.default || exit_nicely
+    cp "$POSTGRESQL_CONF_SAMPLE" "$PGDATA"/postgresql.conf || exit_nicely
 
     echo "Adding template1 database to pg_database"
 

src/bin/pg_ctl/Makefile

@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pg_ctl/Makefile,v 1.4 2000/03/08 01:58:18 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pg_ctl/Makefile,v 1.5 2000/06/04 01:44:36 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -21,7 +21,6 @@ pg_ctl: pg_ctl.sh
 
 install: pg_ctl
 	$(INSTALL) $(INSTL_EXE_OPTS) $+ $(BINDIR)
-	$(INSTALL) $(INSTLOPTS) postmaster.opts.default.sample $(TEMPLATEDIR)
 
 clean:
 	rm -f pg_ctl

src/bin/pg_ctl/postmaster.opts.default.sample

-

src/configure.in

@@ -373,19 +373,6 @@ AC_ARG_WITH(
 )
 export USE_ODBC
 
-AC_MSG_CHECKING(setproctitle)
-AC_ARG_WITH(
-   setproctitle,
-   [  --with-setproctitle     use setproctitle() (EXPERIMENTAL) ],
-   [
-        case "$withval" in
-        y | ye | yes)           USE_SETPROCTITLE=true; AC_MSG_RESULT(enabled) ;;
-        *)                      USE_SETPROCTITLE=false; AC_MSG_RESULT(disabled) ;;
-        esac
-   ],
-   [ USE_SETPROCTITLE=false; AC_MSG_RESULT(disabled) ]
-)
-export USE_SETPROCTITLE
 
 dnl Allow for overriding the default location of the odbcinst.ini
 dnl file which is normally ${prefix}/share or ${prefix} if this is
@@ -732,6 +719,7 @@ AC_CHECK_HEADERS(sys/select.h)
 AC_CHECK_HEADERS(termios.h)
 AC_CHECK_HEADERS(unistd.h)
 AC_CHECK_HEADERS(values.h)
+AC_CHECK_HEADERS(sys/exec.h sys/pstat.h machine/vmparam.h)
 dnl ODBC headers...
 AC_CHECK_HEADERS(sys/param.h pwd.h)
 dnl
@@ -805,11 +793,20 @@ AC_TYPE_SIGNAL
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(memmove sysconf)
 AC_CHECK_FUNCS(sigprocmask waitpid setsid fcvt)
+AC_CHECK_FUNCS(setproctitle pstat)
 
-if test "X$USE_SETPROCTITLE" = "Xtrue"
-then
-AC_CHECK_FUNCS(setproctitle)
-fi
+AC_MSG_CHECKING(for PS_STRINGS)
+AC_TRY_LINK(
+[#ifdef HAVE_MACHINE_VMPARAM_H
+# include <machine/vmparam.h>
+#endif
+#ifdef HAVE_SYS_EXEC_H
+# include <sys/exec.h>
+#endif],
+[PS_STRINGS->ps_nargvstr = 1;
+PS_STRINGS->ps_argvstr = "foo";],
+[AC_MSG_RESULT(yes) AC_DEFINE(HAVE_PS_STRINGS)],
+AC_MSG_RESULT(no))
 
 AC_CHECK_FUNCS(fpclass fp_class fp_class_d class)
 dnl We use our snprintf.c emulation if either snprintf() or vsnprintf()

src/include/config.h.in

@@ -8,7 +8,7 @@
  * or in config.h afterwards.  Of course, if you edit config.h, then your
  * changes will be overwritten the next time you run configure.
  *
- * $Id: config.h.in,v 1.114 2000/05/31 00:28:36 petere Exp $
+ * $Id: config.h.in,v 1.115 2000/06/04 01:44:36 petere Exp $
  */
 
 #ifndef CONFIG_H
@@ -276,6 +276,15 @@
 /* Set to 1 if  you have <values.h> */
 #undef HAVE_VALUES_H
 
+/* Set to 1 if you have <sys/exec.h> */
+#undef HAVE_SYS_EXEC_H
+
+/* Set to 1 if you have <sys/pstat.h> */
+#undef HAVE_SYS_PSTAT_H
+
+/* Set to 1 if you have <machine/vmparam.h> */
+#undef HAVE_MACHINE_VMPARAM_H
+
 /* Define if you have the ANSI C header files.  */
 #undef STDC_HEADERS
 
@@ -285,6 +294,12 @@
 /* Define if you have the setproctitle function.  */
 #undef HAVE_SETPROCTITLE
 
+/* Define if you have the pstat function. */
+#undef HAVE_PSTAT
+
+/* Define if the PS_STRINGS thing exists. */
+#undef HAVE_PS_STRINGS
+
 /* Define if you have the stricmp function.  */
 #undef HAVE_STRICMP
 

src/include/libpq/libpq.h

@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: libpq.h,v 1.36 2000/04/12 17:16:36 momjian Exp $
+ * $Id: libpq.h,v 1.37 2000/06/04 01:44:37 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -236,7 +236,7 @@ extern int32 pqtest(struct varlena * vlena);
 /*
  * prototypes for functions in pqcomm.c
  */
-extern int	StreamServerPort(char *hostName, unsigned short portName, int *fdP);
+extern int	StreamServerPort(int family, unsigned short portName, int *fdP);
 extern int	StreamConnection(int server_fd, Port *port);
 extern void StreamClose(int sock);
 extern void pq_init(void);

src/include/utils/ps_status.h

@@ -2,8 +2,7 @@
  *
  * ps_status.h
  *
- *	Defines macros to show backend status on the ps status line.
- *	Unfortunately this is system dpendent.
+ * Declarations for backend/utils/misc/ps_status.c
  *
  *-------------------------------------------------------------------------
  */
@@ -11,98 +10,17 @@
 #ifndef PS_STATUS_H
 #define PS_STATUS_H
 
-#ifdef HAVE_SETPROCTITLE
+#include "libpq/libpq-be.h"
 
-extern char Ps_status_buffer[];
+void
+init_ps_display(int argc, char *argv[],
+				const char * username, const char * dbname,
+				const char * host_info);
 
-#undef PS_DEFINE_BUFFER
+void
+set_ps_display(const char * value);
 
-#define PS_INIT_STATUS(argc, argv, execname, username, hostname, dbname) \
-        do { \
-                sprintf(Ps_status_buffer, "%s %s %s %s", execname, hostname, username, dbname); \
-	 			setproctitle("%s", Ps_status_buffer); \
-        } while (0)
-
-#define PS_CLEAR_STATUS() \
-        do { setproctitle("%s", Ps_status_buffer); } while (0)
-
-#define PS_SET_STATUS(status) \
-        do { setproctitle("%s %s", Ps_status_buffer, (status)); } while (0)
-
-#define PS_STATUS (Ps_status_buffer)
-
-#elif defined(linux)
-
-#include <string.h>
-
-extern char *ps_status_buffer;
-
-#define PS_DEFINE_BUFFER \
-char *ps_status_buffer = NULL
-
-#define PS_INIT_STATUS(argc, argv, execname, username, hostname, dbname) \
-	do { \
-		int i; \
-		for (i = 0; i < (argc); i++) { \
-			memset((argv)[i], 0, strlen((argv)[i])); \
-		} \
-		ps_status_buffer = (argv)[0]; \
-		sprintf(ps_status_buffer, "%s %s %s %s ", execname, username, hostname, dbname); \
-		ps_status_buffer += strlen(ps_status_buffer); \
-		ps_status_buffer[0] = '\0'; \
-	} while (0)
-
-#define PS_CLEAR_STATUS() \
-	do { \
-		if (ps_status_buffer) \
-			memset(ps_status_buffer, 0, strlen(ps_status_buffer)); \
-	} while (0)
-
-#define PS_SET_STATUS(status) \
-	do { \
-		if (ps_status_buffer) \
-		{ \
-			PS_CLEAR_STATUS(); \
-			strcpy(ps_status_buffer, status); \
-		} \
-	} while (0)
-
-#define PS_STATUS (ps_status_buffer ? ps_status_buffer : "")
-
-#else							/* !linux */
-
-extern char Ps_status_buffer[];
-
-#undef PS_DEFINE_BUFFER
-
-#define PS_INIT_STATUS(argc, argv, execname, username, hostname, dbname) \
-	do { \
-		int i; \
-		Assert(argc >= 5); \
-		argv[0] = execname; \
-		argv[1] = hostname; \
-		argv[2] = username; \
-		argv[3] = dbname; \
-		argv[4] = Ps_status_buffer; \
-		for (i = 5; i < argc; i++) \
-			argv[i] = "";  /* blank them */ \
-	} while (0)
-
-#define PS_CLEAR_STATUS() \
-	do { Ps_status_buffer[0] = '\0'; } while (0)
-
-#define PS_SET_STATUS(status) \
-	do { strcpy(Ps_status_buffer, (status)); } while (0)
-
-#define PS_STATUS (Ps_status_buffer)
-#endif
-
-#ifdef NO_PS_STATUS
-#undef PS_DEFINE_BUFFER
-#define PS_INIT_STATUS(argc, argv, execname, username, hostname, dbname)
-#define PS_CLEAR_STATUS()
-#define PS_SET_STATUS(status) do { if ((status)); } while (0)
-#define PS_STATUS ""
-#endif	 /* !linux */
+const char *
+get_ps_display(void);
 
 #endif	 /* PS_STATUS_H */