diff options
Diffstat (limited to 'src/backend/access/transam/multixact.c')
| -rw-r--r-- | src/backend/access/transam/multixact.c | 31 |
1 files changed, 9 insertions, 22 deletions
diff --git a/src/backend/access/transam/multixact.c b/src/backend/access/transam/multixact.c index 45907d1b449..8f7d12950e5 100644 --- a/src/backend/access/transam/multixact.c +++ b/src/backend/access/transam/multixact.c @@ -282,11 +282,12 @@ typedef struct MultiXactStateData } MultiXactStateData; /* - * Pointers to the state data in shared memory - * - * The index of the last element of the OldestMemberMXactId and - * OldestVisibleMXactId arrays can be obtained with GetMaxOldestSlot(). + * Last element of OldestMemberMXactId and OldestVisibleMXactId arrays. + * Valid elements are (1..MaxOldestSlot); element 0 is never used. */ +#define MaxOldestSlot (MaxBackends + max_prepared_xacts) + +/* Pointers to the state data in shared memory */ static MultiXactStateData *MultiXactState; static MultiXactId *OldestMemberMXactId; static MultiXactId *OldestVisibleMXactId; @@ -341,7 +342,6 @@ static void MultiXactIdSetOldestVisible(void); static void RecordNewMultiXact(MultiXactId multi, MultiXactOffset offset, int nmembers, MultiXactMember *members); static MultiXactId GetNewMultiXactId(int nmembers, MultiXactOffset *offset); -static inline int GetMaxOldestSlot(void); /* MultiXact cache management */ static int mxactMemberComparator(const void *arg1, const void *arg2); @@ -663,17 +663,6 @@ MultiXactIdSetOldestMember(void) } /* - * Retrieve the index of the last element of the OldestMemberMXactId and - * OldestVisibleMXactId arrays. Valid elements are (1..MaxOldestSlot); element - * 0 is never used. - */ -static inline int -GetMaxOldestSlot(void) -{ - return GetMaxBackends() + max_prepared_xacts; -} - -/* * MultiXactIdSetOldestVisible * Save the oldest MultiXactId this transaction considers possibly live. * @@ -695,7 +684,6 @@ MultiXactIdSetOldestVisible(void) if (!MultiXactIdIsValid(OldestVisibleMXactId[MyBackendId])) { MultiXactId oldestMXact; - int maxOldestSlot = GetMaxOldestSlot(); int i; LWLockAcquire(MultiXactGenLock, LW_EXCLUSIVE); @@ -709,7 +697,7 @@ MultiXactIdSetOldestVisible(void) if (oldestMXact < FirstMultiXactId) oldestMXact = FirstMultiXactId; - for (i = 1; i <= maxOldestSlot; i++) + for (i = 1; i <= MaxOldestSlot; i++) { MultiXactId thisoldest = OldestMemberMXactId[i]; @@ -1843,7 +1831,7 @@ MultiXactShmemSize(void) /* We need 2*MaxOldestSlot + 1 perBackendXactIds[] entries */ #define SHARED_MULTIXACT_STATE_SIZE \ add_size(offsetof(MultiXactStateData, perBackendXactIds) + sizeof(MultiXactId), \ - mul_size(sizeof(MultiXactId) * 2, GetMaxOldestSlot())) + mul_size(sizeof(MultiXactId) * 2, MaxOldestSlot)) size = SHARED_MULTIXACT_STATE_SIZE; size = add_size(size, SimpleLruShmemSize(NUM_MULTIXACTOFFSET_BUFFERS, 0)); @@ -1894,7 +1882,7 @@ MultiXactShmemInit(void) * since we only use indexes 1..MaxOldestSlot in each array. */ OldestMemberMXactId = MultiXactState->perBackendXactIds; - OldestVisibleMXactId = OldestMemberMXactId + GetMaxOldestSlot(); + OldestVisibleMXactId = OldestMemberMXactId + MaxOldestSlot; } /* @@ -2519,7 +2507,6 @@ GetOldestMultiXactId(void) { MultiXactId oldestMXact; MultiXactId nextMXact; - int maxOldestSlot = GetMaxOldestSlot(); int i; /* @@ -2538,7 +2525,7 @@ GetOldestMultiXactId(void) nextMXact = FirstMultiXactId; oldestMXact = nextMXact; - for (i = 1; i <= maxOldestSlot; i++) + for (i = 1; i <= MaxOldestSlot; i++) { MultiXactId thisoldest; |