Measure WaitLatch's timeout parameter in milliseconds, not microseconds.

tglsfdc · tglsfdc · commit 74d099494c58 · 2011-08-09T18:52:35.000-04:00
The original definition had the problem that timeouts exceeding about 2100
seconds couldn't be specified on 32-bit machines.  Milliseconds seem like
sufficient resolution, and finer grain than that would be fantasy anyway
on many platforms.

Back-patch to 9.1 so that this aspect of the latch API won't change between
9.1 and later releases.

Peter Geoghegan
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
@@ -10161,7 +10161,7 @@ XLogPageRead(XLogRecPtr *RecPtr, int emode, bool fetching_ckpt,
 					/*
 					 * Wait for more WAL to arrive, or timeout to be reached
 					 */
-					WaitLatch(&XLogCtl->recoveryWakeupLatch, 5000000L);
+					WaitLatch(&XLogCtl->recoveryWakeupLatch, 5000L);
 					ResetLatch(&XLogCtl->recoveryWakeupLatch);
 				}
 				else
diff --git a/src/backend/port/unix_latch.c b/src/backend/port/unix_latch.c
@@ -134,7 +134,7 @@ DisownLatch(volatile Latch *latch)
  * Wait for given latch to be set or until timeout is exceeded.
  * If the latch is already set, the function returns immediately.
  *
- * The 'timeout' is given in microseconds, and -1 means wait forever.
+ * The 'timeout' is given in milliseconds, and -1 means wait forever.
  * On some platforms, signals cause the timeout to be restarted, so beware
  * that the function can sleep for several times longer than the specified
  * timeout.
@@ -173,8 +173,8 @@ WaitLatchOrSocket(volatile Latch *latch, pgsocket sock, bool forRead,
 	/* Initialize timeout */
 	if (timeout >= 0)
 	{
-		tv.tv_sec = timeout / 1000000L;
-		tv.tv_usec = timeout % 1000000L;
+		tv.tv_sec = timeout / 1000L;
+		tv.tv_usec = (timeout % 1000L) * 1000L;
 		tvp = &tv;
 	}
 
diff --git a/src/backend/port/win32_latch.c b/src/backend/port/win32_latch.c
@@ -137,7 +137,7 @@ WaitLatchOrSocket(volatile Latch *latch, pgsocket sock, bool forRead,
 		}
 
 		rc = WaitForMultipleObjects(numevents, events, FALSE,
-							   (timeout >= 0) ? (timeout / 1000) : INFINITE);
+							   (timeout >= 0) ? timeout : INFINITE);
 		if (rc == WAIT_FAILED)
 			elog(ERROR, "WaitForMultipleObjects() failed: error code %d", (int) GetLastError());
 		else if (rc == WAIT_TIMEOUT)
diff --git a/src/backend/replication/syncrep.c b/src/backend/replication/syncrep.c
@@ -251,7 +251,7 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN)
 		 * cancel/die signal or postmaster death regularly while waiting. Note
 		 * that timeout here does not necessarily release from loop.
 		 */
-		WaitLatch(&MyProc->waitLatch, 60000000L);
+		WaitLatch(&MyProc->waitLatch, 60000L);
 	}
 
 	/*
diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c
@@ -807,7 +807,7 @@ WalSndLoop(void)
 			/* Sleep */
 			WaitLatchOrSocket(&MyWalSnd->latch, MyProcPort->sock,
 							  true, pq_is_send_pending(),
-							  sleeptime * 1000L);
+							  sleeptime);
 
 			/* Check for replication timeout */
 			if (replication_timeout > 0 &&

Original file line number	Diff line number	Diff line change
`@@ -10161,7 +10161,7 @@ XLogPageRead(XLogRecPtr *RecPtr, int emode, bool fetching_ckpt,`
`10161`	`10161`	`/*`
`10162`	`10162`	`* Wait for more WAL to arrive, or timeout to be reached`
`10163`	`10163`	`*/`
`10164`		`- WaitLatch(&XLogCtl->recoveryWakeupLatch, 5000000L);`
	`10164`	`+ WaitLatch(&XLogCtl->recoveryWakeupLatch, 5000L);`
`10165`	`10165`	`ResetLatch(&XLogCtl->recoveryWakeupLatch);`
`10166`	`10166`	`}`
`10167`	`10167`	`else`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ DisownLatch(volatile Latch *latch)`
`134`	`134`	`* Wait for given latch to be set or until timeout is exceeded.`
`135`	`135`	`* If the latch is already set, the function returns immediately.`
`136`	`136`	`*`
`137`		`- * The 'timeout' is given in microseconds, and -1 means wait forever.`
	`137`	`+ * The 'timeout' is given in milliseconds, and -1 means wait forever.`
`138`	`138`	`* On some platforms, signals cause the timeout to be restarted, so beware`
`139`	`139`	`* that the function can sleep for several times longer than the specified`
`140`	`140`	`* timeout.`
`@@ -173,8 +173,8 @@ WaitLatchOrSocket(volatile Latch *latch, pgsocket sock, bool forRead,`
`173`	`173`	`/* Initialize timeout */`
`174`	`174`	`if (timeout >= 0)`
`175`	`175`	`{`
`176`		`- tv.tv_sec = timeout / 1000000L;`
`177`		`- tv.tv_usec = timeout % 1000000L;`
	`176`	`+ tv.tv_sec = timeout / 1000L;`
	`177`	`+ tv.tv_usec = (timeout % 1000L) * 1000L;`
`178`	`178`	`tvp = &tv;`
`179`	`179`	`}`
`180`	`180`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ WaitLatchOrSocket(volatile Latch *latch, pgsocket sock, bool forRead,`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`rc = WaitForMultipleObjects(numevents, events, FALSE,`
`140`		`- (timeout >= 0) ? (timeout / 1000) : INFINITE);`
	`140`	`+ (timeout >= 0) ? timeout : INFINITE);`
`141`	`141`	`if (rc == WAIT_FAILED)`
`142`	`142`	`elog(ERROR, "WaitForMultipleObjects() failed: error code %d", (int) GetLastError());`
`143`	`143`	`else if (rc == WAIT_TIMEOUT)`
Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN)`
`251`	`251`	`* cancel/die signal or postmaster death regularly while waiting. Note`
`252`	`252`	`* that timeout here does not necessarily release from loop.`
`253`	`253`	`*/`
`254`		`- WaitLatch(&MyProc->waitLatch, 60000000L);`
	`254`	`+ WaitLatch(&MyProc->waitLatch, 60000L);`
`255`	`255`	`}`
`256`	`256`
`257`	`257`	`/*`