From: Massimo Dal Zotto <dz@cs.unitn.it>

> tprintf.patch
>
>       tprintf.patch
>
>       adds functions and macros which implement a conditional trace package
>       with the ability to change flags and numeric options of running
>       backends at runtime.
>       Options/flags can be specified in the command line and/or read from
>       the file pg_options in the data directory.

src/backend/access/nbtree/nbtree.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.29 1998/08/19 02:01:16 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.30 1998/08/25 21:33:56 scrappy Exp $
  *
  * NOTES
  *	  This file contains only the public interface routines.
@@ -35,8 +35,8 @@
 
 #ifdef BTREE_BUILD_STATS
 #include <tcop/tcopprot.h>
-extern int	ShowExecutorStats;
-
+#include <utils/trace.h>
+#define ShowExecutorStats pg_options[TRACE_EXECUTORSTATS]
 #endif
 
 

src/backend/access/nbtree/nbtsort.c

@@ -5,7 +5,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Id: nbtsort.c,v 1.30 1998/06/15 19:27:59 momjian Exp $
+ *	  $Id: nbtsort.c,v 1.31 1998/08/25 21:33:57 scrappy Exp $
  *
  * NOTES
  *
@@ -64,8 +64,8 @@
 
 #ifdef BTREE_BUILD_STATS
 #include "tcop/tcopprot.h"
-extern int	ShowExecutorStats;
-
+#include <utils/trace.h>
+#define ShowExecutorStats pg_options[TRACE_EXECUTORSTATS]
 #endif
 
 static BTItem _bt_buildadd(Relation index, void *pstate, BTItem bti, int flags);

src/backend/postmaster/postmaster.c

@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.94 1998/08/25 21:04:36 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.95 1998/08/25 21:33:59 scrappy Exp $
  *
  * NOTES
  *
@@ -92,6 +92,7 @@
 #include "port-protos.h"		/* For gethostname() */
 #endif
 #include "storage/fd.h"
+#include "utils/trace.h"
 
 #if !defined(MAXINT)
 #define MAXINT		   INT_MAX
@@ -116,6 +117,8 @@ typedef struct bkend
 	long		cancel_key;		/* cancel key for cancels for this backend */
 } Backend;
 
+Port *MyBackendPort = NULL;
+
 /* list of active backends.  For garbage collection only now. */
 
 static Dllist *BackendList;
@@ -232,6 +235,7 @@ static int processCancelRequest(Port *port, PacketLen len, void *pkt);
 static int initMasks(fd_set *rmask, fd_set *wmask);
 static long PostmasterRandom(void);
 static void RandomSalt(char *salt);
+static void SignalChildren(SIGNAL_ARGS);
 
 #ifdef CYR_RECODE
 void GetCharSetByHost(char *, int, char *);
@@ -314,16 +318,16 @@ PostmasterMain(int argc, char *argv[])
 	 *	We need three params so we can display status.  If we don't
 	 *	get them from the user, let's make them ourselves.
 	 */
-	if (argc < 4)
+	if (argc < 5)
 	{
 		int i;
-		char *new_argv[5];
+		char *new_argv[6];
 
 		for (i=0; i < argc; i++)
 			new_argv[i] = argv[i];
-		for (; i < 4; i++)
+		for (; i < 5; i++)
 			new_argv[i] = "";
-		new_argv[4] = NULL;
+		new_argv[5] = NULL;
 
 		if (!Execfile[0] && FindExec(Execfile, argv[0], "postmaster") < 0)
 		{
@@ -363,6 +367,7 @@ PostmasterMain(int argc, char *argv[])
 		hostName = hostbuf;
 	}
 
+	MyProcPid = getpid();
 	DataDir = getenv("PGDATA"); /* default value */
 
 	opterr = 0;
@@ -424,6 +429,7 @@ PostmasterMain(int argc, char *argv[])
 				}
 				else
 					DebugLvl = 1;
+				pg_options[TRACE_VERBOSE] = DebugLvl;
 				break;
 			case 'i':
 				NetServer = true;
@@ -535,14 +541,17 @@ PostmasterMain(int argc, char *argv[])
 	 * Set up signal handlers for the postmaster process.
 	 */
 
-	pqsignal(SIGINT, pmdie);
-	pqsignal(SIGCHLD, reaper);
-	pqsignal(SIGTTIN, SIG_IGN);
-	pqsignal(SIGTTOU, SIG_IGN);
-	pqsignal(SIGHUP, pmdie);
-	pqsignal(SIGTERM, pmdie);
-	pqsignal(SIGCONT, dumpstatus);
-	pqsignal(SIGPIPE, SIG_IGN);
+	pqsignal(SIGHUP,   pmdie);		/* send SIGHUP, don't die */
+	pqsignal(SIGINT,   pmdie);		/* die */
+	pqsignal(SIGQUIT,  pmdie);		/* send SIGTERM and die */
+	pqsignal(SIGTERM,  pmdie);		/* send SIGTERM,SIGKILL and die */
+	pqsignal(SIGPIPE,  SIG_IGN);	/* ignored */
+	pqsignal(SIGUSR1,  pmdie);		/* send SIGUSR1 and die */
+	pqsignal(SIGUSR2,  pmdie);		/* send SIGUSR2, don't die */
+	pqsignal(SIGCHLD,  reaper);		/* handle child termination */
+	pqsignal(SIGTTIN,  SIG_IGN);	/* ignored */
+	pqsignal(SIGTTOU,  SIG_IGN);	/* ignored */
+	pqsignal(SIGWINCH, dumpstatus);	/* dump port status */
 
 	status = ServerLoop();
 
@@ -980,6 +989,52 @@ reset_shared(short port)
 static void
 pmdie(SIGNAL_ARGS)
 {
+	int i;
+
+	TPRINTF(TRACE_VERBOSE, "pmdie %d", postgres_signal_arg);
+
+	/*
+	 * Kill self and/or children processes depending on signal number.
+	 */
+	switch (postgres_signal_arg) {
+		case SIGHUP:
+			/* Send SIGHUP to all children (update options flags) */
+			SignalChildren(SIGHUP);
+			/* Don't die */
+			return;
+		case SIGINT:
+			/* Die without killing children */
+			break;
+		case SIGQUIT:
+			/* Shutdown all children with SIGTERM */
+			SignalChildren(SIGTERM);
+			/* Don't die */
+			return;
+		case SIGTERM:
+			/* Shutdown all children with SIGTERM and SIGKILL, then die */
+			SignalChildren(SIGTERM);
+			for (i=0; i<10; i++) {
+				if (!DLGetHead(BackendList)) {
+					break;
+				}
+				sleep(1);
+			}
+			if (DLGetHead(BackendList)) {
+				SignalChildren(SIGKILL);
+			}
+			break;
+		case SIGUSR1:
+			/* Quick die all children with SIGUSR1 and die */
+			SignalChildren(SIGUSR1);
+			break;
+		case SIGUSR2:
+			/* Send SIGUSR2 to all children (AsyncNotifyHandler) */
+			SignalChildren(SIGUSR2);
+			/* Don't die */
+			return;
+	}
+
+	/* exit postmaster */
 	proc_exit(0);
 }
 
@@ -1122,6 +1177,35 @@ CleanupProc(int pid,
 	}
 }
 
+/*
+ * Send a signal to all chidren processes.
+ */
+static void
+SignalChildren(int signal)
+{
+	Dlelem		*curr,
+				*next;
+	Backend 	*bp;
+	int			mypid = getpid();
+
+	curr = DLGetHead(BackendList);
+	while (curr)
+	{
+		next = DLGetSucc(curr);
+		bp = (Backend *) DLE_VAL(curr);
+
+		if (bp->pid != mypid)
+		{
+			TPRINTF(TRACE_VERBOSE,
+					"SignalChildren: sending signal %d to process %d",
+					signal, bp->pid);
+			kill(bp->pid, signal);
+		}
+
+		curr = next;
+	}
+}
+
 /*
  * BackendStartup -- start backend process
  *
@@ -1342,6 +1426,9 @@ DoBackend(Port *port)
 		StreamClose(ServerSock_INET);
 	StreamClose(ServerSock_UNIX);
 
+	/* Save port for ps status */
+	MyProcPort = port;
+
 	/*
 	 * Don't want backend to be able to see the postmaster random number
 	 * generator state.  We have to clobber the static random_seed *and*
@@ -1368,7 +1455,13 @@ DoBackend(Port *port)
 	 *	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
 
 	/* Tell the backend it is being called from the postmaster */
 	av[ac++] = "-p";
@@ -1386,8 +1479,6 @@ DoBackend(Port *port)
 		sprintf(debugbuf, "-d%d", DebugLvl);
 		av[ac++] = debugbuf;
 	}
-	else
-		av[ac++] = "-Q";
 
 	/* Pass the requested debugging output file */
 	if (port->tty[0])

src/backend/storage/ipc/ipc.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.30 1998/07/12 04:43:28 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.31 1998/08/25 21:34:01 scrappy Exp $
  *
  * NOTES
  *
@@ -39,6 +39,7 @@
 #include <sys/shm.h>
 #include "utils/memutils.h"
 #include "libpq/libpq.h"
+#include "utils/trace.h"
 
 #if defined(solaris_sparc)
 #include <string.h>
@@ -113,17 +114,26 @@ proc_exit(int code)
 {
 	int			i;
 
+	TPRINTF(TRACE_VERBOSE, "proc_exit(%d) [#%d]", code, proc_exit_inprogress);
+
+    /*
+	 * If proc_exit is called too many times something bad is
+	 * happenig, so exit immediately.
+	 */
+	if (proc_exit_inprogress > 9) {
+		elog(ERROR, "infinite recursion in proc_exit");
+		goto exit;
+	}
+
 	/* ----------------
 	 *	if proc_exit_inprocess is true, then it means that we
 	 *	are being invoked from within an on_exit() handler
 	 *	and so we return immediately to avoid recursion.
 	 * ----------------
 	 */
-	if (proc_exit_inprogress)
+	if (proc_exit_inprogress++)
 		return;
 
-	proc_exit_inprogress = 1;
-
 	/* do our shared memory exits first */
 	shmem_exit(code);
 	
@@ -134,6 +144,8 @@ proc_exit(int code)
 	for (i = on_proc_exit_index - 1; i >= 0; --i)
 		(*on_proc_exit_list[i].function) (code, on_proc_exit_list[i].arg);
 
+exit:
+	TPRINTF(TRACE_VERBOSE, "exit(%d)", code);
 	exit(code);
 }
 
@@ -150,17 +162,27 @@ shmem_exit(int code)
 {
 	int			i;
 
+	TPRINTF(TRACE_VERBOSE, "shmem_exit(%d) [#%d]",
+			code, shmem_exit_inprogress);
+
+	/*
+	 * If shmem_exit is called too many times something bad is
+	 * happenig, so exit immediately.
+	 */
+	if (shmem_exit_inprogress > 9) {
+		elog(ERROR, "infinite recursion in shmem_exit");
+		exit(-1);
+	}
+
 	/* ----------------
 	 *	if shmem_exit_inprocess is true, then it means that we
 	 *	are being invoked from within an on_exit() handler
 	 *	and so we return immediately to avoid recursion.
 	 * ----------------
 	 */
-	if (shmem_exit_inprogress)
+	if (shmem_exit_inprogress++)
 		return;
 
-	shmem_exit_inprogress = 1;
-
 	/* ----------------
 	 *	call all the callbacks registered before calling exit().
 	 * ----------------
@@ -315,7 +337,7 @@ IpcSemaphoreCreate(IpcSemaphoreKey semKey,
 	{
 		*status = IpcSemIdNotExist;		/* there doesn't exist a semaphore */
 #ifdef DEBUG_IPC
-		fprintf(stderr, "calling semget with %d, %d , %d\n",
+		EPRINTF("calling semget with %d, %d , %d\n",
 				semKey,
 				semNum,
 				IPC_CREAT | permission);
@@ -324,8 +346,9 @@ IpcSemaphoreCreate(IpcSemaphoreKey semKey,
 
 		if (semId < 0)
 		{
-			perror("semget");
-			IpcConfigTip();
+			EPRINTF("IpcSemaphoreCreate: semget failed (%s) "
+					"key=%d, num=%d, permission=%o",
+					strerror(errno), semKey, semNum, permission);
 			proc_exit(3);
 		}
 		for (i = 0; i < semNum; i++)
@@ -334,8 +357,8 @@ IpcSemaphoreCreate(IpcSemaphoreKey semKey,
 		errStatus = semctl(semId, 0, SETALL, semun);
 		if (errStatus == -1)
 		{
-			perror("semctl");
-			IpcConfigTip();
+			EPRINTF("IpcSemaphoreCreate: semctl failed (%s) id=%d",
+					strerror(errno), semId);
 		}
 
 		if (removeOnExit)
@@ -349,7 +372,7 @@ IpcSemaphoreCreate(IpcSemaphoreKey semKey,
 	}
 
 #ifdef DEBUG_IPC
-	fprintf(stderr, "\nIpcSemaphoreCreate, status %d, returns %d\n",
+	EPRINTF("\nIpcSemaphoreCreate, status %d, returns %d\n",
 			*status,
 			semId);
 	fflush(stdout);
@@ -379,8 +402,8 @@ IpcSemaphoreSet(int semId, int semno, int value)
 
 	if (errStatus == -1)
 	{
-		perror("semctl");
-		IpcConfigTip();
+	    EPRINTF("IpcSemaphoreSet: semctl failed (%s) id=%d",
+				strerror(errno), semId);
 	}
 }
 
@@ -441,8 +464,8 @@ IpcSemaphoreLock(IpcSemaphoreId semId, int sem, int lock)
 
 	if (errStatus == -1)
 	{
-		perror("semop");
-		IpcConfigTip();
+		EPRINTF("IpcSemaphoreLock: semop failed (%s) id=%d",
+				strerror(errno), semId);
 		proc_exit(255);
 	}
 }
@@ -486,8 +509,8 @@ IpcSemaphoreUnlock(IpcSemaphoreId semId, int sem, int lock)
 
 	if (errStatus == -1)
 	{
-		perror("semop");
-		IpcConfigTip();
+		EPRINTF("IpcSemaphoreUnlock: semop failed (%s) id=%d",
+				strerror(errno), semId);
 		proc_exit(255);
 	}
 }
@@ -534,10 +557,9 @@ IpcMemoryCreate(IpcMemoryKey memKey, uint32 size, int permission)
 
 	if (shmid < 0)
 	{
-		fprintf(stderr, "IpcMemoryCreate: memKey=%d , size=%d , permission=%d",
-				memKey, size, permission);
-		perror("IpcMemoryCreate: shmget(..., create, ...) failed");
-		IpcConfigTip();
+		EPRINTF("IpcMemoryCreate: shmget failed (%s) "
+				"key=%d, size=%d, permission=%o",
+				strerror(errno), memKey, size, permission);
 		return (IpcMemCreationFailed);
 	}
 
@@ -560,10 +582,9 @@ IpcMemoryIdGet(IpcMemoryKey memKey, uint32 size)
 
 	if (shmid < 0)
 	{
-		fprintf(stderr, "IpcMemoryIdGet: memKey=%d , size=%d , permission=%d",
-				memKey, size, 0);
-		perror("IpcMemoryIdGet:  shmget() failed");
-		IpcConfigTip();
+		EPRINTF("IpcMemoryIdGet: shmget failed (%s) "
+				"key=%d, size=%d, permission=%o",
+				strerror(errno), memKey, size, 0);
 		return (IpcMemIdGetFailed);
 	}
 
@@ -602,8 +623,8 @@ IpcMemoryAttach(IpcMemoryId memId)
 	/* if ( *memAddress == -1) { XXX ??? */
 	if (memAddress == (char *) -1)
 	{
-		perror("IpcMemoryAttach: shmat() failed");
-		IpcConfigTip();
+		EPRINTF("IpcMemoryAttach: shmat failed (%s) id=%d",
+				strerror(errno), memId);
 		return (IpcMemAttachFailed);
 	}
 

src/backend/storage/ipc/spin.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/spin.c,v 1.14 1998/06/27 15:47:45 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/spin.c,v 1.15 1998/08/25 21:34:03 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -31,6 +31,7 @@
 #include "storage/shmem.h"
 #include "storage/spin.h"
 #include "storage/proc.h"
+#include "utils/trace.h"
 
 #ifndef HAS_TEST_AND_SET
 #include <sys/sem.h>
@@ -81,10 +82,12 @@ InitSpinLocks(int init, IPCKey key)
 }
 
 #ifdef LOCKDEBUG
-#define PRINT_LOCK(LOCK) printf("(locklock = %d, flag = %d, nshlocks = %d, \
-shlock = %d, exlock =%d)\n", LOCK->locklock, \
-								LOCK->flag, LOCK->nshlocks, LOCK->shlock, \
-								LOCK->exlock)
+#define PRINT_LOCK(LOCK) \
+    TPRINTF(TRACE_SPINLOCKS, \
+			"(locklock = %d, flag = %d, nshlocks = %d, shlock = %d, " \
+			"exlock =%d)\n", LOCK->locklock, \
+			LOCK->flag, LOCK->nshlocks, LOCK->shlock, \
+			LOCK->exlock)
 #endif
 
 /* from ipc.c */
@@ -98,8 +101,7 @@ SpinAcquire(SPINLOCK lockid)
 	/* This used to be in ipc.c, but move here to reduce function calls */
 	slckP = &(SLockArray[lockid]);
 #ifdef LOCKDEBUG
-	printf("SpinAcquire(%d)\n", lockid);
-	printf("IN: ");
+	TPRINTF(TRACE_SPINLOCKS, "SpinAcquire: %d", lockid);
 	PRINT_LOCK(slckP);
 #endif
 ex_try_again:
@@ -112,7 +114,7 @@ ex_try_again:
 			S_LOCK(&(slckP->shlock));
 			S_UNLOCK(&(slckP->locklock));
 #ifdef LOCKDEBUG
-			printf("OUT: ");
+			TPRINTF(TRACE_SPINLOCKS, "OUT: ");
 			PRINT_LOCK(slckP);
 #endif
 			break;
@@ -124,6 +126,9 @@ ex_try_again:
 			goto ex_try_again;
 	}
 	PROC_INCR_SLOCK(lockid);
+#ifdef LOCKDEBUG
+	TPRINTF(TRACE_SPINLOCKS, "SpinAcquire: got %d", lockid);
+#endif
 }
 
 void
@@ -131,13 +136,23 @@ SpinRelease(SPINLOCK lockid)
 {
 	SLock	   *slckP;
 
-	PROC_DECR_SLOCK(lockid);
-
 	/* This used to be in ipc.c, but move here to reduce function calls */
 	slckP = &(SLockArray[lockid]);
+
+#ifdef USE_ASSERT_CHECKING
+	/*
+	 * Check that we are actually holding the lock we are releasing.
+	 * This can be done only after MyProc has been initialized.
+	 */
+	if (MyProc)
+		Assert(MyProc->sLocks[lockid] > 0);
+	Assert(slckP->flag != NOLOCK);
+#endif
+
+	PROC_DECR_SLOCK(lockid);
+
 #ifdef LOCKDEBUG
-	printf("SpinRelease(%d)\n", lockid);
-	printf("IN: ");
+	TPRINTF("SpinRelease: %d\n", lockid);
 	PRINT_LOCK(slckP);
 #endif
 	S_LOCK(&(slckP->locklock));
@@ -160,7 +175,7 @@ SpinRelease(SPINLOCK lockid)
 	S_UNLOCK(&(slckP->exlock));
 	S_UNLOCK(&(slckP->locklock));
 #ifdef LOCKDEBUG
-	printf("OUT: ");
+	TPRINTF(TRACE_SPINLOCKS, "SpinRelease: released %d", lockid);
 	PRINT_LOCK(slckP);
 #endif
 }

src/backend/utils/error/assert.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/error/assert.c,v 1.9 1998/06/18 16:35:38 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/error/assert.c,v 1.10 1998/08/25 21:34:06 scrappy Exp $
  *
  * NOTE
  *	  This should eventually work with elog(), dlog(), etc.
@@ -21,6 +21,7 @@
 #include "utils/module.h"
 
 #include "utils/exc.h"
+#include "utils/trace.h"
 
 int
 ExceptionalCondition(char *conditionName,
@@ -39,7 +40,7 @@ ExceptionalCondition(char *conditionName,
 		|| !PointerIsValid(fileName)
 		|| !PointerIsValid(exceptionP))
 	{
-		fprintf(stderr, "ExceptionalCondition: bad arguments\n");
+		EPRINTF("TRAP: ExceptionalCondition: bad arguments\n");
 
 		ExcAbort(exceptionP,
 				 (ExcDetail) detail,
@@ -48,9 +49,9 @@ ExceptionalCondition(char *conditionName,
 	}
 	else
 	{
-		fprintf(stderr,
-				"%s(\"%s:%s\", File: \"%s\", Line: %d)\n",
-		exceptionP->message, conditionName, detail == NULL ? "" : detail,
+		EPRINTF("TRAP: %s(\"%s:%s\", File: \"%s\", Line: %d)\n",
+				exceptionP->message, conditionName, 
+				(detail == NULL ? "" : detail),
 				fileName, lineNumber);
 	}
 

src/backend/utils/error/elog.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.31 1998/07/07 22:00:31 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.32 1998/08/25 21:34:08 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,10 +24,29 @@
 #include <unistd.h>
 #include <signal.h>
 
+#ifdef USE_SYSLOG
+#include <syslog.h>
+#endif
+
 #include "postgres.h"
 #include "miscadmin.h"
 #include "libpq/libpq.h"
 #include "storage/proc.h"
+#include "utils/trace.h"
+
+#ifdef USE_SYSLOG
+/*
+ * Global option to control the use of syslog(3) for logging:
+ *
+ *		0 	stdout/stderr only
+ *  	1   stdout/stderr + syslog
+ *  	2   syslog only
+ */
+#define UseSyslog pg_options[OPT_SYSLOG]
+#define PG_LOG_FACILITY	LOG_LOCAL0
+#else
+#define UseSyslog 0
+#endif
 
 static int	Debugfile = -1;
 static int	Err_file = -1;
@@ -52,12 +71,12 @@ elog(int lev, const char *fmt,...)
 
 #ifndef PG_STANDALONE
 	extern FILE *Pfout;
+#endif
 
-#endif							/* !PG_STANDALONE */
-#ifdef ELOG_TIMESTAMPS
-	time_t		tim;
-
+#ifdef USE_SYSLOG
+	int			log_level;
 #endif
+
 	int			len;
 	int			i = 0;
 
@@ -72,7 +91,7 @@ elog(int lev, const char *fmt,...)
 				i = 0;
 			if (i > 30)
 				i = i % 30;
-			cp = "DEBUG:  ";
+			cp = "DEBUG: ";
 			break;
 		case DEBUG:
 			i = ElogDebugIndentLevel;
@@ -80,27 +99,25 @@ elog(int lev, const char *fmt,...)
 				i = 0;
 			if (i > 30)
 				i = i % 30;
-			cp = "DEBUG:  ";
+			cp = "DEBUG: ";
 			break;
 		case NOTICE:
-			cp = "NOTICE:  ";
+			cp = "NOTICE: ";
 			break;
 		case ERROR:
-			cp = "ERROR:  ";
+			cp = "ERROR: ";
 			break;
 		default:
-			sprintf(line, "FATAL %d:  ", lev);
+			sprintf(line, "FATAL %d: ", lev);
 			cp = line;
 	}
 #ifdef ELOG_TIMESTAMPS
-	time(&tim);
-	strcat(strcpy(buf, cp), ctime(&tim) + 4);
-	bp = buf + strlen(buf) - 6;
-	*bp++ = ':';
+	strcpy(buf, tprintf_timestamp());
+	strcat(buf, cp);
 #else
 	strcpy(buf, cp);
-	bp = buf + strlen(buf);
 #endif
+	bp = buf + strlen(buf);
 	while (i-- > 0)
 		*bp++ = ' ';
 	for (cp = fmt; *cp; cp++)
@@ -118,8 +135,31 @@ elog(int lev, const char *fmt,...)
 	*bp = '\0';
 	vsprintf(line, buf, ap);
 	va_end(ap);
+
+#ifdef USE_SYSLOG
+	switch (lev) {
+	case NOIND:
+		log_level = LOG_DEBUG;
+		break;
+	case DEBUG:
+		log_level = LOG_DEBUG;
+		break;
+	case NOTICE:
+		log_level = LOG_NOTICE;
+		break;
+	case ERROR:
+		log_level = LOG_WARNING;
+		break;
+	case FATAL:
+	default:
+		log_level = LOG_ERR;
+		break;
+	}
+	write_syslog(log_level, line+TIMESTAMP_SIZE);
+#endif
+
 	len = strlen(strcat(line, "\n"));
-	if (Debugfile > -1)
+	if ((Debugfile > -1) && (UseSyslog <= 1))
 		write(Debugfile, line, len);
 	if (lev == DEBUG || lev == NOIND)
 		return;
@@ -135,7 +175,7 @@ elog(int lev, const char *fmt,...)
 	 * log.  This is a major pain.
 	 */
 
-	if (Err_file > -1 && Debugfile != Err_file)
+	if (Err_file > -1 && Debugfile != Err_file && (UseSyslog <= 1))
 	{
 		if (write(Err_file, line, len) < 0)
 		{
@@ -157,7 +197,7 @@ elog(int lev, const char *fmt,...)
 		else
 			pq_putnchar("E", 1);
 		/* pq_putint(-101, 4); *//* should be query id */
-		pq_putstr(line);
+		pq_putstr(line+TIMESTAMP_SIZE);		/* don't show timestamps */
 		pq_flush();
 	}
 	if (Pfout == NULL)
@@ -178,7 +218,7 @@ elog(int lev, const char *fmt,...)
 		ProcReleaseSpins(NULL); /* get rid of spinlocks we hold */
 		if (!InError)
 		{
-			kill(MyProcPid, SIGHUP); /* abort to traffic cop */
+			kill(MyProcPid, SIGQUIT); /* abort to traffic cop */
 			pause();
 		}
 

src/backend/utils/misc/Makefile

@@ -4,7 +4,7 @@
 #    Makefile for utils/misc
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/misc/Makefile,v 1.8 1998/07/26 04:31:06 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/misc/Makefile,v 1.9 1998/08/25 21:34:10 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -17,7 +17,7 @@ ifdef MULTIBYTE
 CFLAGS+= $(MBFLAGS)
 endif
 
-OBJS = database.o superuser.o 
+OBJS = database.o superuser.o trace.o 
 
 all: SUBSYS.o