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/commands/async.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/commands/async.c')
| -rw-r--r-- | src/backend/commands/async.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c index 0767d97ef91..f1e0b4bcf54 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 - * $PostgreSQL: pgsql/src/backend/commands/async.c,v 1.143 2008/12/09 14:28:20 heikki Exp $ + * $PostgreSQL: pgsql/src/backend/commands/async.c,v 1.144 2008/12/09 15:59:39 heikki Exp $ * *------------------------------------------------------------------------- */ @@ -915,10 +915,9 @@ EnableNotifyInterrupt(void) * a frontend command. Signal handler execution of inbound notifies * is disabled until the next EnableNotifyInterrupt call. * - * This also needs to be called when SIGUSR1 with - * PROCSIG_CATCHUP_INTERRUPT is received, so as to prevent conflicts - * if one signal interrupts the other. So we must return the previous - * state of the flag. + * The SIGUSR1 signal handler also needs to call this, so as to + * prevent conflicts if one signal interrupts the other. So we + * must return the previous state of the flag. */ bool DisableNotifyInterrupt(void) @@ -955,7 +954,7 @@ ProcessIncomingNotify(void) nulls[Natts_pg_listener]; bool catchup_enabled; - /* Must prevent catchup interrupt while I am running */ + /* Must prevent SIGUSR1 interrupt while I am running */ catchup_enabled = DisableCatchupInterrupt(); if (Trace_notify) |