Commit fe8821ca authored by Fujii Masao's avatar Fujii Masao

Use int instead of size_t in procarray.c.

All size_t variables declared in procarray.c are actually int ones.
Let's use int instead of size_t for those variables. Which would
reduce Wsign-compare compiler warnings.

Back-patch to v14 where commit 941697c3 added size_t variables
in procarray.c, to make future back-patching easy though
this patch is classified as refactoring only.

Reported-by: Ranier Vilela
Author: Ranier Vilela, Aleksander Alekseev
https://postgr.es/m/CAEudQAqyoTZC670xWi6w-Oe2_Bk1bfu2JzXz6xRfiOUzm7xbyQ@mail.gmail.com
parent d84d62b6
...@@ -714,7 +714,7 @@ ProcArrayEndTransaction(PGPROC *proc, TransactionId latestXid) ...@@ -714,7 +714,7 @@ ProcArrayEndTransaction(PGPROC *proc, TransactionId latestXid)
static inline void static inline void
ProcArrayEndTransactionInternal(PGPROC *proc, TransactionId latestXid) ProcArrayEndTransactionInternal(PGPROC *proc, TransactionId latestXid)
{ {
size_t pgxactoff = proc->pgxactoff; int pgxactoff = proc->pgxactoff;
/* /*
* Note: we need exclusive lock here because we're going to change other * Note: we need exclusive lock here because we're going to change other
...@@ -886,7 +886,7 @@ ProcArrayGroupClearXid(PGPROC *proc, TransactionId latestXid) ...@@ -886,7 +886,7 @@ ProcArrayGroupClearXid(PGPROC *proc, TransactionId latestXid)
void void
ProcArrayClearTransaction(PGPROC *proc) ProcArrayClearTransaction(PGPROC *proc)
{ {
size_t pgxactoff; int pgxactoff;
/* /*
* Currently we need to lock ProcArrayLock exclusively here, as we * Currently we need to lock ProcArrayLock exclusively here, as we
...@@ -1366,7 +1366,7 @@ TransactionIdIsInProgress(TransactionId xid) ...@@ -1366,7 +1366,7 @@ TransactionIdIsInProgress(TransactionId xid)
TransactionId topxid; TransactionId topxid;
TransactionId latestCompletedXid; TransactionId latestCompletedXid;
int mypgxactoff; int mypgxactoff;
size_t numProcs; int numProcs;
int j; int j;
/* /*
...@@ -1443,7 +1443,7 @@ TransactionIdIsInProgress(TransactionId xid) ...@@ -1443,7 +1443,7 @@ TransactionIdIsInProgress(TransactionId xid)
/* No shortcuts, gotta grovel through the array */ /* No shortcuts, gotta grovel through the array */
mypgxactoff = MyProc->pgxactoff; mypgxactoff = MyProc->pgxactoff;
numProcs = arrayP->numProcs; numProcs = arrayP->numProcs;
for (size_t pgxactoff = 0; pgxactoff < numProcs; pgxactoff++) for (int pgxactoff = 0; pgxactoff < numProcs; pgxactoff++)
{ {
int pgprocno; int pgprocno;
PGPROC *proc; PGPROC *proc;
...@@ -2208,7 +2208,7 @@ GetSnapshotData(Snapshot snapshot) ...@@ -2208,7 +2208,7 @@ GetSnapshotData(Snapshot snapshot)
TransactionId *other_xids = ProcGlobal->xids; TransactionId *other_xids = ProcGlobal->xids;
TransactionId xmin; TransactionId xmin;
TransactionId xmax; TransactionId xmax;
size_t count = 0; int count = 0;
int subcount = 0; int subcount = 0;
bool suboverflowed = false; bool suboverflowed = false;
FullTransactionId latest_completed; FullTransactionId latest_completed;
...@@ -2290,7 +2290,7 @@ GetSnapshotData(Snapshot snapshot) ...@@ -2290,7 +2290,7 @@ GetSnapshotData(Snapshot snapshot)
if (!snapshot->takenDuringRecovery) if (!snapshot->takenDuringRecovery)
{ {
size_t numProcs = arrayP->numProcs; int numProcs = arrayP->numProcs;
TransactionId *xip = snapshot->xip; TransactionId *xip = snapshot->xip;
int *pgprocnos = arrayP->pgprocnos; int *pgprocnos = arrayP->pgprocnos;
XidCacheStatus *subxidStates = ProcGlobal->subxidStates; XidCacheStatus *subxidStates = ProcGlobal->subxidStates;
...@@ -2300,7 +2300,7 @@ GetSnapshotData(Snapshot snapshot) ...@@ -2300,7 +2300,7 @@ GetSnapshotData(Snapshot snapshot)
* First collect set of pgxactoff/xids that need to be included in the * First collect set of pgxactoff/xids that need to be included in the
* snapshot. * snapshot.
*/ */
for (size_t pgxactoff = 0; pgxactoff < numProcs; pgxactoff++) for (int pgxactoff = 0; pgxactoff < numProcs; pgxactoff++)
{ {
/* Fetch xid just once - see GetNewTransactionId */ /* Fetch xid just once - see GetNewTransactionId */
TransactionId xid = UINT32_ACCESS_ONCE(other_xids[pgxactoff]); TransactionId xid = UINT32_ACCESS_ONCE(other_xids[pgxactoff]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment