aboutsummaryrefslogtreecommitdiff
path: root/src/backend/access/transam/xlog.c
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2011-08-09 18:52:29 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2011-08-09 18:52:29 -0400
commit9f17ffd8660243382809b8023ff3d38fbfac4e8b (patch)
treef58c4fa6f2509bb157dcad8ad4223673ed55d383 /src/backend/access/transam/xlog.c
parent4e15a4db5e65e43271f8d20750d6500ab12632d0 (diff)
downloadpostgresql-9f17ffd8660243382809b8023ff3d38fbfac4e8b.tar.gz
postgresql-9f17ffd8660243382809b8023ff3d38fbfac4e8b.zip
Measure WaitLatch's timeout parameter in milliseconds, not microseconds.
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
Diffstat (limited to 'src/backend/access/transam/xlog.c')
-rw-r--r--src/backend/access/transam/xlog.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 6a6959f728c..4d2bfdf4f17 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -10210,7 +10210,9 @@ retry:
/*
* Wait for more WAL to arrive, or timeout to be reached
*/
- WaitLatch(&XLogCtl->recoveryWakeupLatch, WL_LATCH_SET | WL_TIMEOUT, 5000000L);
+ WaitLatch(&XLogCtl->recoveryWakeupLatch,
+ WL_LATCH_SET | WL_TIMEOUT,
+ 5000L);
ResetLatch(&XLogCtl->recoveryWakeupLatch);
}
else