diff --git a/src/backend/replication/slot.c b/src/backend/replication/slot.c index c66619c..5b18cb6 100644 --- a/src/backend/replication/slot.c +++ b/src/backend/replication/slot.c @@ -288,15 +288,11 @@ ReplicationSlotCreate(const char *name, bool db_specific, slot->in_use = true; /* We can now mark the slot active, and that makes it our slot. */ - { - volatile ReplicationSlot *vslot = slot; - - SpinLockAcquire(&slot->mutex); - Assert(vslot->active_pid == 0); - vslot->active_pid = MyProcPid; - SpinLockRelease(&slot->mutex); - MyReplicationSlot = slot; - } + SpinLockAcquire(&slot->mutex); + Assert(slot->active_pid == 0); + slot->active_pid = MyProcPid; + SpinLockRelease(&slot->mutex); + MyReplicationSlot = slot; LWLockRelease(ReplicationSlotControlLock); @@ -329,12 +325,10 @@ ReplicationSlotAcquire(const char *name) if (s->in_use && strcmp(name, NameStr(s->data.name)) == 0) { - volatile ReplicationSlot *vslot = s; - SpinLockAcquire(&s->mutex); - active_pid = vslot->active_pid; + active_pid = s->active_pid; if (active_pid == 0) - vslot->active_pid = MyProcPid; + s->active_pid = MyProcPid; SpinLockRelease(&s->mutex); slot = s; break; @@ -380,10 +374,8 @@ ReplicationSlotRelease(void) else { /* Mark slot inactive. We're not freeing it, just disconnecting. */ - volatile ReplicationSlot *vslot = slot; - SpinLockAcquire(&slot->mutex); - vslot->active_pid = 0; + slot->active_pid = 0; SpinLockRelease(&slot->mutex); } @@ -459,11 +451,10 @@ ReplicationSlotDropAcquired(void) } else { - volatile ReplicationSlot *vslot = slot; bool fail_softly = slot->data.persistency == RS_EPHEMERAL; SpinLockAcquire(&slot->mutex); - vslot->active_pid = 0; + slot->active_pid = 0; SpinLockRelease(&slot->mutex); ereport(fail_softly ? WARNING : ERROR, @@ -533,16 +524,13 @@ ReplicationSlotSave(void) void ReplicationSlotMarkDirty(void) { + ReplicationSlot *slot = MyReplicationSlot; Assert(MyReplicationSlot != NULL); - { - volatile ReplicationSlot *vslot = MyReplicationSlot; - - SpinLockAcquire(&vslot->mutex); - MyReplicationSlot->just_dirtied = true; - MyReplicationSlot->dirty = true; - SpinLockRelease(&vslot->mutex); - } + SpinLockAcquire(&slot->mutex); + MyReplicationSlot->just_dirtied = true; + MyReplicationSlot->dirty = true; + SpinLockRelease(&slot->mutex); } /* @@ -557,13 +545,9 @@ ReplicationSlotPersist(void) Assert(slot != NULL); Assert(slot->data.persistency != RS_PERSISTENT); - { - volatile ReplicationSlot *vslot = slot; - - SpinLockAcquire(&slot->mutex); - vslot->data.persistency = RS_PERSISTENT; - SpinLockRelease(&slot->mutex); - } + SpinLockAcquire(&slot->mutex); + slot->data.persistency = RS_PERSISTENT; + SpinLockRelease(&slot->mutex); ReplicationSlotMarkDirty(); ReplicationSlotSave(); @@ -593,14 +577,10 @@ ReplicationSlotsComputeRequiredXmin(bool already_locked) if (!s->in_use) continue; - { - volatile ReplicationSlot *vslot = s; - - SpinLockAcquire(&s->mutex); - effective_xmin = vslot->effective_xmin; - effective_catalog_xmin = vslot->effective_catalog_xmin; - SpinLockRelease(&s->mutex); - } + SpinLockAcquire(&s->mutex); + effective_xmin = s->effective_xmin; + effective_catalog_xmin = s->effective_catalog_xmin; + SpinLockRelease(&s->mutex); /* check the data xmin */ if (TransactionIdIsValid(effective_xmin) && @@ -641,13 +621,9 @@ ReplicationSlotsComputeRequiredLSN(void) if (!s->in_use) continue; - { - volatile ReplicationSlot *vslot = s; - - SpinLockAcquire(&s->mutex); - restart_lsn = vslot->data.restart_lsn; - SpinLockRelease(&s->mutex); - } + SpinLockAcquire(&s->mutex); + restart_lsn = s->data.restart_lsn; + SpinLockRelease(&s->mutex); if (restart_lsn != InvalidXLogRecPtr && (min_required == InvalidXLogRecPtr || @@ -684,7 +660,7 @@ ReplicationSlotsComputeLogicalRestartLSN(void) for (i = 0; i < max_replication_slots; i++) { - volatile ReplicationSlot *s; + ReplicationSlot *s; XLogRecPtr restart_lsn; s = &ReplicationSlotCtl->replication_slots[i]; @@ -733,7 +709,7 @@ ReplicationSlotsCountDBSlots(Oid dboid, int *nslots, int *nactive) LWLockAcquire(ReplicationSlotControlLock, LW_SHARED); for (i = 0; i < max_replication_slots; i++) { - volatile ReplicationSlot *s; + ReplicationSlot *s; s = &ReplicationSlotCtl->replication_slots[i]; @@ -1023,14 +999,10 @@ SaveSlotToPath(ReplicationSlot *slot, const char *dir, int elevel) bool was_dirty; /* first check whether there's something to write out */ - { - volatile ReplicationSlot *vslot = slot; - - SpinLockAcquire(&vslot->mutex); - was_dirty = vslot->dirty; - vslot->just_dirtied = false; - SpinLockRelease(&vslot->mutex); - } + SpinLockAcquire(&slot->mutex); + was_dirty = slot->dirty; + slot->just_dirtied = false; + SpinLockRelease(&slot->mutex); /* and don't do anything if there's nothing to write */ if (!was_dirty) @@ -1124,14 +1096,10 @@ SaveSlotToPath(ReplicationSlot *slot, const char *dir, int elevel) * Successfully wrote, unset dirty bit, unless somebody dirtied again * already. */ - { - volatile ReplicationSlot *vslot = slot; - - SpinLockAcquire(&vslot->mutex); - if (!vslot->just_dirtied) - vslot->dirty = false; - SpinLockRelease(&vslot->mutex); - } + SpinLockAcquire(&slot->mutex); + if (!slot->just_dirtied) + slot->dirty = false; + SpinLockRelease(&slot->mutex); LWLockRelease(slot->io_in_progress_lock); } diff --git a/src/backend/replication/walreceiver.c b/src/backend/replication/walreceiver.c index 41e57f2..183a3a5 100644 --- a/src/backend/replication/walreceiver.c +++ b/src/backend/replication/walreceiver.c @@ -192,9 +192,7 @@ WalReceiverMain(void) TimeLineID startpointTLI; TimeLineID primaryTLI; bool first_stream; - - /* use volatile pointer to prevent code rearrangement */ - volatile WalRcvData *walrcv = WalRcv; + WalRcvData *walrcv = WalRcv; TimestampTz last_recv_timestamp; bool ping_sent; @@ -559,8 +557,7 @@ WalReceiverMain(void) static void WalRcvWaitForStartPosition(XLogRecPtr *startpoint, TimeLineID *startpointTLI) { - /* use volatile pointer to prevent code rearrangement */ - volatile WalRcvData *walrcv = WalRcv; + WalRcvData *walrcv = WalRcv; int state; SpinLockAcquire(&walrcv->mutex); @@ -693,8 +690,7 @@ WalRcvFetchTimeLineHistoryFiles(TimeLineID first, TimeLineID last) static void WalRcvDie(int code, Datum arg) { - /* use volatile pointer to prevent code rearrangement */ - volatile WalRcvData *walrcv = WalRcv; + WalRcvData *walrcv = WalRcv; /* Ensure that all WAL records received are flushed to disk */ XLogWalRcvFlush(true); @@ -974,8 +970,7 @@ XLogWalRcvFlush(bool dying) { if (LogstreamResult.Flush < LogstreamResult.Write) { - /* use volatile pointer to prevent code rearrangement */ - volatile WalRcvData *walrcv = WalRcv; + WalRcvData *walrcv = WalRcv; issue_xlog_fsync(recvFile, recvSegNo); @@ -1179,8 +1174,7 @@ XLogWalRcvSendHSFeedback(bool immed) static void ProcessWalSndrMessage(XLogRecPtr walEnd, TimestampTz sendTime) { - /* use volatile pointer to prevent code rearrangement */ - volatile WalRcvData *walrcv = WalRcv; + WalRcvData *walrcv = WalRcv; TimestampTz lastMsgReceiptTime = GetCurrentTimestamp(); diff --git a/src/backend/replication/walreceiverfuncs.c b/src/backend/replication/walreceiverfuncs.c index f77a790..4452f25 100644 --- a/src/backend/replication/walreceiverfuncs.c +++ b/src/backend/replication/walreceiverfuncs.c @@ -72,8 +72,7 @@ WalRcvShmemInit(void) bool WalRcvRunning(void) { - /* use volatile pointer to prevent code rearrangement */ - volatile WalRcvData *walrcv = WalRcv; + WalRcvData *walrcv = WalRcv; WalRcvState state; pg_time_t startTime; @@ -118,8 +117,7 @@ WalRcvRunning(void) bool WalRcvStreaming(void) { - /* use volatile pointer to prevent code rearrangement */ - volatile WalRcvData *walrcv = WalRcv; + WalRcvData *walrcv = WalRcv; WalRcvState state; pg_time_t startTime; @@ -165,8 +163,7 @@ WalRcvStreaming(void) void ShutdownWalRcv(void) { - /* use volatile pointer to prevent code rearrangement */ - volatile WalRcvData *walrcv = WalRcv; + WalRcvData *walrcv = WalRcv; pid_t walrcvpid = 0; /* @@ -227,8 +224,7 @@ void RequestXLogStreaming(TimeLineID tli, XLogRecPtr recptr, const char *conninfo, const char *slotname) { - /* use volatile pointer to prevent code rearrangement */ - volatile WalRcvData *walrcv = WalRcv; + WalRcvData *walrcv = WalRcv; bool launch = false; pg_time_t now = (pg_time_t) time(NULL); @@ -298,8 +294,7 @@ RequestXLogStreaming(TimeLineID tli, XLogRecPtr recptr, const char *conninfo, XLogRecPtr GetWalRcvWriteRecPtr(XLogRecPtr *latestChunkStart, TimeLineID *receiveTLI) { - /* use volatile pointer to prevent code rearrangement */ - volatile WalRcvData *walrcv = WalRcv; + WalRcvData *walrcv = WalRcv; XLogRecPtr recptr; SpinLockAcquire(&walrcv->mutex); @@ -320,9 +315,7 @@ GetWalRcvWriteRecPtr(XLogRecPtr *latestChunkStart, TimeLineID *receiveTLI) int GetReplicationApplyDelay(void) { - /* use volatile pointer to prevent code rearrangement */ - volatile WalRcvData *walrcv = WalRcv; - + WalRcvData *walrcv = WalRcv; XLogRecPtr receivePtr; XLogRecPtr replayPtr; @@ -359,8 +352,7 @@ GetReplicationApplyDelay(void) int GetReplicationTransferLatency(void) { - /* use volatile pointer to prevent code rearrangement */ - volatile WalRcvData *walrcv = WalRcv; + WalRcvData *walrcv = WalRcv; TimestampTz lastMsgSendTime; TimestampTz lastMsgReceiptTime; diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c index c95fe75..c6043cd 100644 --- a/src/backend/replication/walsender.c +++ b/src/backend/replication/walsender.c @@ -641,8 +641,7 @@ StartReplication(StartReplicationCmd *cmd) /* Initialize shared memory status, too */ { - /* use volatile pointer to prevent code rearrangement */ - volatile WalSnd *walsnd = MyWalSnd; + WalSnd *walsnd = MyWalSnd; SpinLockAcquire(&walsnd->mutex); walsnd->sentPtr = sentPtr; @@ -990,8 +989,7 @@ StartLogicalReplication(StartReplicationCmd *cmd) /* Also update the sent position status in shared memory */ { - /* use volatile pointer to prevent code rearrangement */ - volatile WalSnd *walsnd = MyWalSnd; + WalSnd *walsnd = MyWalSnd; SpinLockAcquire(&walsnd->mutex); walsnd->sentPtr = MyReplicationSlot->data.restart_lsn; @@ -1494,9 +1492,7 @@ static void PhysicalConfirmReceivedLocation(XLogRecPtr lsn) { bool changed = false; - - /* use volatile pointer to prevent code rearrangement */ - volatile ReplicationSlot *slot = MyReplicationSlot; + ReplicationSlot *slot = MyReplicationSlot; Assert(lsn != InvalidXLogRecPtr); SpinLockAcquire(&slot->mutex); @@ -1554,8 +1550,7 @@ ProcessStandbyReplyMessage(void) * standby. */ { - /* use volatile pointer to prevent code rearrangement */ - volatile WalSnd *walsnd = MyWalSnd; + WalSnd *walsnd = MyWalSnd; SpinLockAcquire(&walsnd->mutex); walsnd->write = writePtr; @@ -1584,7 +1579,7 @@ static void PhysicalReplicationSlotNewXmin(TransactionId feedbackXmin) { bool changed = false; - volatile ReplicationSlot *slot = MyReplicationSlot; + ReplicationSlot *slot = MyReplicationSlot; SpinLockAcquire(&slot->mutex); MyPgXact->xmin = InvalidTransactionId; @@ -1934,8 +1929,7 @@ InitWalSenderSlot(void) */ for (i = 0; i < max_wal_senders; i++) { - /* use volatile pointer to prevent code rearrangement */ - volatile WalSnd *walsnd = &WalSndCtl->walsnds[i]; + WalSnd *walsnd = &WalSndCtl->walsnds[i]; SpinLockAcquire(&walsnd->mutex); @@ -2145,8 +2139,7 @@ retry: */ if (am_cascading_walsender) { - /* use volatile pointer to prevent code rearrangement */ - volatile WalSnd *walsnd = MyWalSnd; + WalSnd *walsnd = MyWalSnd; bool reload; SpinLockAcquire(&walsnd->mutex); @@ -2384,8 +2377,7 @@ XLogSendPhysical(void) /* Update shared memory status */ { - /* use volatile pointer to prevent code rearrangement */ - volatile WalSnd *walsnd = MyWalSnd; + WalSnd *walsnd = MyWalSnd; SpinLockAcquire(&walsnd->mutex); walsnd->sentPtr = sentPtr; @@ -2447,8 +2439,7 @@ XLogSendLogical(void) /* Update shared memory status */ { - /* use volatile pointer to prevent code rearrangement */ - volatile WalSnd *walsnd = MyWalSnd; + WalSnd *walsnd = MyWalSnd; SpinLockAcquire(&walsnd->mutex); walsnd->sentPtr = sentPtr; @@ -2539,8 +2530,7 @@ WalSndRqstFileReload(void) for (i = 0; i < max_wal_senders; i++) { - /* use volatile pointer to prevent code rearrangement */ - volatile WalSnd *walsnd = &WalSndCtl->walsnds[i]; + WalSnd *walsnd = &WalSndCtl->walsnds[i]; if (walsnd->pid == 0) continue; @@ -2692,8 +2682,7 @@ WalSndWakeup(void) void WalSndSetState(WalSndState state) { - /* use volatile pointer to prevent code rearrangement */ - volatile WalSnd *walsnd = MyWalSnd; + WalSnd *walsnd = MyWalSnd; Assert(am_walsender); @@ -2777,8 +2766,7 @@ pg_stat_get_wal_senders(PG_FUNCTION_ARGS) for (i = 0; i < max_wal_senders; i++) { - /* use volatile pointer to prevent code rearrangement */ - volatile WalSnd *walsnd = &WalSndCtl->walsnds[i]; + WalSnd *walsnd = &WalSndCtl->walsnds[i]; XLogRecPtr sentPtr; XLogRecPtr write; XLogRecPtr flush; @@ -2934,8 +2922,7 @@ GetOldestWALSendPointer(void) for (i = 0; i < max_wal_senders; i++) { - /* use volatile pointer to prevent code rearrangement */ - volatile WalSnd *walsnd = &WalSndCtl->walsnds[i]; + WalSnd *walsnd = &WalSndCtl->walsnds[i]; XLogRecPtr recptr; if (walsnd->pid == 0)