From 9eacd427e811a97337de1fdd61a3cb90604981ad Mon Sep 17 00:00:00 2001 From: Magnus Hagander Date: Thu, 13 Jan 2011 18:51:13 +0100 Subject: [PATCH] Make sure walsender state is only read while holding the spinlock Noted by Robert Haas. --- src/backend/replication/walsender.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c index a0f20ab41f..cacd577acc 100644 --- a/src/backend/replication/walsender.c +++ b/src/backend/replication/walsender.c @@ -1050,6 +1050,7 @@ pg_stat_get_wal_senders(PG_FUNCTION_ARGS) volatile WalSnd *walsnd = &WalSndCtl->walsnds[i]; char sent_location[MAXFNAMELEN]; XLogRecPtr sentPtr; + WalSndState state; Datum values[PG_STAT_GET_WAL_SENDERS_COLS]; bool nulls[PG_STAT_GET_WAL_SENDERS_COLS]; @@ -1058,6 +1059,7 @@ pg_stat_get_wal_senders(PG_FUNCTION_ARGS) SpinLockAcquire(&walsnd->mutex); sentPtr = walsnd->sentPtr; + state = walsnd->state; SpinLockRelease(&walsnd->mutex); snprintf(sent_location, sizeof(sent_location), "%X/%X", @@ -1065,7 +1067,7 @@ pg_stat_get_wal_senders(PG_FUNCTION_ARGS) memset(nulls, 0, sizeof(nulls)); values[0] = Int32GetDatum(walsnd->pid); - values[1] = CStringGetTextDatum(WalSndGetStateString(walsnd->state)); + values[1] = CStringGetTextDatum(WalSndGetStateString(state)); values[2] = CStringGetTextDatum(sent_location); tuplestore_putvalues(tupstore, tupdesc, values, nulls); -- 2.11.0