git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c

index 239688cd9d436a4db874493e878644c2e252e06d..b2ce0b25f2a96f672558736da834e45f0fbb27b2 100644 (file)

--- a/src/backend/storage/ipc/procarray.c

+++ b/src/backend/storage/ipc/procarray.c

*

*

* IDENTIFICATION

- * $PostgreSQL: pgsql/src/backend/storage/ipc/procarray.c,v 1.73 2010年08月12日 23:24:54 rhaas Exp $

+ * $PostgreSQL: pgsql/src/backend/storage/ipc/procarray.c,v 1.74 2010年08月30日 14:16:48 sriggs Exp $

*

*-------------------------------------------------------------------------

*/

static int KnownAssignedXidsGetAndSetXmin(TransactionId *xarray,

TransactionId *xmin,

TransactionId xmax);

+static int KnownAssignedXidsGetOldestXmin(void);

static void KnownAssignedXidsDisplay(int trace_level);

/*

}

}

+ if (RecoveryInProgress())

+ {

+ /*

+ * Check to see whether KnownAssignedXids contains an xid value

+ * older than the main procarray.

+ */

+ TransactionId kaxmin = KnownAssignedXidsGetOldestXmin();

+ if (TransactionIdIsNormal(kaxmin) &&

+ TransactionIdPrecedes(kaxmin, result))

+ result = kaxmin;

+ }

+

LWLockRelease(ProcArrayLock);

/*

return count;

}

+static int

+KnownAssignedXidsGetOldestXmin(void)

+{

+ /* use volatile pointer to prevent code rearrangement */

+ volatile ProcArrayStruct *pArray = procArray;

+ int head,

+ tail;

+ int i;

+

+ /*

+ * Fetch head just once, since it may change while we loop.

+ */

+ SpinLockAcquire(&pArray->known_assigned_xids_lck);

+ tail = pArray->tailKnownAssignedXids;

+ head = pArray->headKnownAssignedXids;

+ SpinLockRelease(&pArray->known_assigned_xids_lck);

+

+ for (i = tail; i < head; i++)

+ {

+ /* Skip any gaps in the array */

+ if (KnownAssignedXidsValid[i])

+ return KnownAssignedXids[i];

+ }

+

+ return InvalidTransactionId;

+}

+

/*

* Display KnownAssignedXids to provide debug trail

*