aboutsummaryrefslogtreecommitdiff
path: root/src/backend
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend')
-rw-r--r--src/backend/commands/async.c4
-rw-r--r--src/backend/postmaster/postmaster.c24
-rw-r--r--src/backend/storage/lmgr/proc.c8
-rw-r--r--src/backend/tcop/postgres.c24
4 files changed, 30 insertions, 30 deletions
diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c
index 1b1d59f77e4..366d6ee4456 100644
--- a/src/backend/commands/async.c
+++ b/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.66 2000/07/08 03:04:12 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.67 2000/08/27 19:00:24 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -587,7 +587,7 @@ AtAbort_Notify()
*/
void
-Async_NotifyHandler(SIGNAL_ARGS)
+Async_NotifyHandler(int signum)
{
/*
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 3f4b1fa7c57..c2d46a354cc 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -11,7 +11,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.160 2000/08/20 10:55:33 petere Exp $
+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.161 2000/08/27 19:00:26 petere Exp $
*
* NOTES
*
@@ -231,10 +231,10 @@ static void pmdaemonize(int argc, char *argv[]);
static Port *ConnCreate(int serverFd);
static void ConnFree(Port *port);
static void reset_shared(int port);
-static void SIGHUP_handler(SIGNAL_ARGS);
-static void pmdie(SIGNAL_ARGS);
-static void reaper(SIGNAL_ARGS);
-static void dumpstatus(SIGNAL_ARGS);
+static void SIGHUP_handler(int signum);
+static void pmdie(int signum);
+static void reaper(int signum);
+static void dumpstatus(int signum);
static void CleanupProc(int pid, int exitstatus);
static int DoBackend(Port *port);
static void ExitPostmaster(int status);
@@ -246,7 +246,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);
+static void SignalChildren(int signum);
static int CountChildren(void);
static bool CreateOptsFile(int argc, char *argv[]);
@@ -1266,7 +1266,7 @@ reset_shared(int port)
* main loop
*/
static void
-SIGHUP_handler(SIGNAL_ARGS)
+SIGHUP_handler(int signum)
{
got_SIGHUP = true;
if (Shutdown > SmartShutdown)
@@ -1281,14 +1281,14 @@ SIGHUP_handler(SIGNAL_ARGS)
* pmdie -- signal handler for cleaning up after a kill signal.
*/
static void
-pmdie(SIGNAL_ARGS)
+pmdie(int signum)
{
PG_SETMASK(&BlockSig);
if (DebugLvl >= 1)
- elog(DEBUG, "pmdie %d", postgres_signal_arg);
+ elog(DEBUG, "pmdie %d", signum);
- switch (postgres_signal_arg)
+ switch (signum)
{
case SIGUSR2:
@@ -1399,7 +1399,7 @@ pmdie(SIGNAL_ARGS)
* Reaper -- signal handler to cleanup after a backend (child) dies.
*/
static void
-reaper(SIGNAL_ARGS)
+reaper(int signum)
{
/* GH: replace waitpid for !HAVE_WAITPID. Does this work ? */
#ifdef HAVE_WAITPID
@@ -1970,7 +1970,7 @@ ExitPostmaster(int status)
}
static void
-dumpstatus(SIGNAL_ARGS)
+dumpstatus(int signum)
{
Dlelem *curr;
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
index 01818e99fa7..6dcdd0b10d5 100644
--- a/src/backend/storage/lmgr/proc.c
+++ b/src/backend/storage/lmgr/proc.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.77 2000/07/31 01:16:24 inoue Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.78 2000/08/27 19:00:28 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -47,7 +47,7 @@
* This is so that we can support more backends. (system-wide semaphore
* sets run out pretty fast.) -ay 4/95
*
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.77 2000/07/31 01:16:24 inoue Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.78 2000/08/27 19:00:28 petere Exp $
*/
#include <sys/time.h>
#include <unistd.h>
@@ -68,7 +68,7 @@
#include "storage/proc.h"
-void HandleDeadLock(SIGNAL_ARGS);
+void HandleDeadLock(int signum);
static void ProcFreeAllSemaphores(void);
static bool GetOffWaitqueue(PROC *);
@@ -812,7 +812,7 @@ ProcAddLock(SHM_QUEUE *elem)
* --------------------
*/
void
-HandleDeadLock(SIGNAL_ARGS)
+HandleDeadLock(int signum)
{
LOCK *mywaitlock;
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 1c9095d69f7..0e96f365e83 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.171 2000/08/11 23:45:35 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.172 2000/08/27 19:00:31 petere Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
@@ -83,7 +83,7 @@ CommandDest whereToSendOutput = Debug;
extern void StartupXLOG(void);
extern void ShutdownXLOG(void);
-extern void HandleDeadLock(SIGNAL_ARGS);
+extern void HandleDeadLock(int signum);
extern char XLogDir[];
extern char ControlFilePath[];
@@ -129,9 +129,9 @@ int XfuncMode = 0;
static int InteractiveBackend(StringInfo inBuf);
static int SocketBackend(StringInfo inBuf);
static int ReadCommand(StringInfo inBuf);
-static void SigHupHandler(SIGNAL_ARGS);
-static void FloatExceptionHandler(SIGNAL_ARGS);
-static void quickdie(SIGNAL_ARGS);
+static void SigHupHandler(int signum);
+static void FloatExceptionHandler(int signum);
+static void quickdie(int signum);
/*
* Flag to mark SIGHUP. Whenever the main loop comes around it
@@ -705,13 +705,13 @@ pg_exec_query_dest(char *query_string, /* string to execute */
*/
void
-handle_warn(SIGNAL_ARGS)
+handle_warn(int signum)
{
siglongjmp(Warn_restart, 1);
}
static void
-quickdie(SIGNAL_ARGS)
+quickdie(int signum)
{
PG_SETMASK(&BlockSig);
elog(NOTICE, "Message from PostgreSQL backend:"
@@ -735,7 +735,7 @@ quickdie(SIGNAL_ARGS)
* Abort transaction and exit
*/
void
-die(SIGNAL_ARGS)
+die(int signum)
{
PG_SETMASK(&BlockSig);
@@ -752,7 +752,7 @@ die(SIGNAL_ARGS)
/* signal handler for floating point exception */
static void
-FloatExceptionHandler(SIGNAL_ARGS)
+FloatExceptionHandler(int signum)
{
elog(ERROR, "floating point exception!"
" The last floating point operation either exceeded legal ranges"
@@ -761,7 +761,7 @@ FloatExceptionHandler(SIGNAL_ARGS)
/* signal handler for query cancel signal from postmaster */
static void
-QueryCancelHandler(SIGNAL_ARGS)
+QueryCancelHandler(int signum)
{
QueryCancel = true;
LockWaitCancel();
@@ -779,7 +779,7 @@ CancelQuery(void)
}
static void
-SigHupHandler(SIGNAL_ARGS)
+SigHupHandler(int signum)
{
got_SIGHUP = true;
}
@@ -1404,7 +1404,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
if (!IsUnderPostmaster)
{
puts("\nPOSTGRES backend interactive interface ");
- puts("$Revision: 1.171 $ $Date: 2000/08/11 23:45:35 $\n");
+ puts("$Revision: 1.172 $ $Date: 2000/08/27 19:00:31 $\n");
}
/*