database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-03 09:13:20 +03:00
Code Activity

Fix unportable coding in DetermineSleepTime().

Browse Source 
We should not assume that struct timeval.tv_sec is a long, because
it ain't necessarily.  (POSIX says that it's a time_t, which might
well be 64 bits now or in the future; or for that matter might be
32 bits on machines with 64-bit longs.)  Per buildfarm member panther.

Back-patch to 9.3 where the dubious coding was introduced.
This commit is contained in:
Tom Lane
2014-02-15 17:09:54 -05:00
parent 38855bed5a
commit dada4747a0
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/postmaster/postmaster.c
View File

@@ -1478,10 +1478,12 @@ DetermineSleepTime(struct timeval * timeout)
if (next_wakeup != 0) if (next_wakeup != 0)
{ {
long secs;
int microsecs; int microsecs;
TimestampDifference(GetCurrentTimestamp(), next_wakeup, TimestampDifference(GetCurrentTimestamp(), next_wakeup,
&timeout->tv_sec, &microsecs); &secs, &microsecs);
timeout->tv_sec = secs;
timeout->tv_usec = microsecs; timeout->tv_usec = microsecs;
/* Ensure we don't exceed one minute */ /* Ensure we don't exceed one minute */