diff options
| author | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2008-12-09 15:59:39 +0000 |
|---|---|---|
| committer | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2008-12-09 15:59:39 +0000 |
| commit | dea81a6cf620528e6c17e9973b32b54e0076cf06 (patch) | |
| tree | 35e1201dc7d82bb5d3cc70fce7dd5a326e4237e0 /src/backend/tcop/postgres.c | |
| parent | 7b05b3fa3996c6b7795c22757a31e2348378209d (diff) | |
| download | postgresql-dea81a6cf620528e6c17e9973b32b54e0076cf06.tar.gz postgresql-dea81a6cf620528e6c17e9973b32b54e0076cf06.zip | |
Revert SIGUSR1 multiplexing patch, per Tom's objection.
Diffstat (limited to 'src/backend/tcop/postgres.c')
| -rw-r--r-- | src/backend/tcop/postgres.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 6df02a3f795..b09401652b8 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.559 2008/12/09 14:28:20 heikki Exp $ + * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.560 2008/12/09 15:59:39 heikki Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -2437,23 +2437,6 @@ drop_unnamed_stmt(void) */ /* - * proc_sigusr1_handler - handle SIGUSR1 signal. - * - * SIGUSR1 is multiplexed to handle multiple different events. The signalFlags - * array in PGPROC indicates which events have been signaled. - */ -void -proc_sigusr1_handler(SIGNAL_ARGS) -{ - int save_errno = errno; - - if (CheckProcSignal(PROCSIG_CATCHUP_INTERRUPT)) - HandleCatchupInterrupt(); - - errno = save_errno; -} - -/* * quickdie() occurs when signalled SIGQUIT by the postmaster. * * Some backend has bought the farm, @@ -3197,7 +3180,7 @@ PostgresMain(int argc, char *argv[], const char *username) * of output during who-knows-what operation... */ pqsignal(SIGPIPE, SIG_IGN); - pqsignal(SIGUSR1, proc_sigusr1_handler); + pqsignal(SIGUSR1, CatchupInterruptHandler); pqsignal(SIGUSR2, NotifyInterruptHandler); pqsignal(SIGFPE, FloatExceptionHandler); |