diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/replication/walreceiver.h | 12 | ||||
| -rw-r--r-- | src/include/storage/pmsignal.h | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/include/replication/walreceiver.h b/src/include/replication/walreceiver.h index a645d18b5dc..083eb4f07fb 100644 --- a/src/include/replication/walreceiver.h +++ b/src/include/replication/walreceiver.h @@ -5,7 +5,7 @@ * * Portions Copyright (c) 2010-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/replication/walreceiver.h,v 1.4 2010/01/20 18:54:27 heikki Exp $ + * $PostgreSQL: pgsql/src/include/replication/walreceiver.h,v 1.5 2010/01/27 15:27:51 heikki Exp $ * *------------------------------------------------------------------------- */ @@ -27,10 +27,10 @@ */ typedef enum { - WALRCV_NOT_STARTED, - WALRCV_RUNNING, /* walreceiver has been started */ - WALRCV_STOPPING, /* requested to stop, but still running */ - WALRCV_STOPPED /* stopped and mustn't start up again */ + WALRCV_STOPPED, /* stopped and mustn't start up again */ + WALRCV_STARTING, /* launched, but the process hasn't initialized yet */ + WALRCV_RUNNING, /* walreceiver is running */ + WALRCV_STOPPING /* requested to stop, but still running */ } WalRcvState; /* Shared memory area for management of walreceiver process */ @@ -47,6 +47,7 @@ typedef struct */ pid_t pid; WalRcvState walRcvState; + pg_time_t startTime; /* * receivedUpto-1 is the last byte position that has been already @@ -74,6 +75,7 @@ extern PGDLLIMPORT walrcv_disconnect_type walrcv_disconnect; extern void WalReceiverMain(void); extern Size WalRcvShmemSize(void); extern void WalRcvShmemInit(void); +extern void ShutdownWalRcv(void); extern bool WalRcvInProgress(void); extern XLogRecPtr WaitNextXLogAvailable(XLogRecPtr recptr, bool *finished); extern void RequestXLogStreaming(XLogRecPtr recptr, const char *conninfo); diff --git a/src/include/storage/pmsignal.h b/src/include/storage/pmsignal.h index 75ef17a5a0a..c49c2f5fd2b 100644 --- a/src/include/storage/pmsignal.h +++ b/src/include/storage/pmsignal.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/pmsignal.h,v 1.28 2010/01/15 09:19:09 heikki Exp $ + * $PostgreSQL: pgsql/src/include/storage/pmsignal.h,v 1.29 2010/01/27 15:27:51 heikki Exp $ * *------------------------------------------------------------------------- */ @@ -30,7 +30,6 @@ typedef enum PMSIGNAL_START_AUTOVAC_LAUNCHER, /* start an autovacuum launcher */ PMSIGNAL_START_AUTOVAC_WORKER, /* start an autovacuum worker */ PMSIGNAL_START_WALRECEIVER, /* start a walreceiver */ - PMSIGNAL_SHUTDOWN_WALRECEIVER, /* shut down a walreceiver */ NUM_PMSIGNALS /* Must be last value of enum! */ } PMSignalReason; |