From 35eb0bee3b4e90115c75739c16892c158b375c40 Mon Sep 17 00:00:00 2001 From: Thomas Munro Date: Wed, 11 Jan 2023 14:48:06 +1300 Subject: [PATCH v10 2/2] Refactor DetermineSleepTime() to use milliseconds. Since we're not using select() anymore, we don't need to bother with struct timeval. We can work directly in milliseconds, which the latch API wants. This change was kept separate to make review easier. --- src/backend/postmaster/postmaster.c | 59 ++++++++++------------------- 1 file changed, 19 insertions(+), 40 deletions(-) diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 8bbc1042a5..b55e3e77bc 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -1586,7 +1586,7 @@ checkControlFile(void) } /* - * Determine how long should we let ServerLoop sleep. + * Determine how long should we let ServerLoop sleep, in milliseconds. * * In normal conditions we wait at most one minute, to ensure that the other * background tasks handled by ServerLoop get done even when no requests are @@ -1594,8 +1594,8 @@ checkControlFile(void) * we don't actually sleep so that they are quickly serviced. Other exception * cases are as shown in the code. */ -static void -DetermineSleepTime(struct timeval *timeout) +static int +DetermineSleepTime(void) { TimestampTz next_wakeup = 0; @@ -1608,26 +1608,20 @@ DetermineSleepTime(struct timeval *timeout) { if (AbortStartTime != 0) { + int seconds; + /* time left to abort; clamp to 0 in case it already expired */ - timeout->tv_sec = SIGKILL_CHILDREN_AFTER_SECS - - (time(NULL) - AbortStartTime); - timeout->tv_sec = Max(timeout->tv_sec, 0); - timeout->tv_usec = 0; + seconds = Max(0, + SIGKILL_CHILDREN_AFTER_SECS - (time(NULL) - AbortStartTime)); + + return Max(seconds * 1000, 0); } else - { - timeout->tv_sec = 60; - timeout->tv_usec = 0; - } - return; + return 60 * 1000; } if (StartWorkerNeeded) - { - timeout->tv_sec = 0; - timeout->tv_usec = 0; - return; - } + return 0; if (HaveCrashedWorker) { @@ -1665,26 +1659,14 @@ DetermineSleepTime(struct timeval *timeout) if (next_wakeup != 0) { - long secs; - int microsecs; - - TimestampDifference(GetCurrentTimestamp(), next_wakeup, - &secs, µsecs); - timeout->tv_sec = secs; - timeout->tv_usec = microsecs; - - /* Ensure we don't exceed one minute */ - if (timeout->tv_sec > 60) - { - timeout->tv_sec = 60; - timeout->tv_usec = 0; - } - } - else - { - timeout->tv_sec = 60; - timeout->tv_usec = 0; + /* Ensure we don't exceed one minute, or go under 0. */ + return Max(0, + Min(60 * 1000, + TimestampDifferenceMilliseconds(GetCurrentTimestamp(), + next_wakeup))); } + + return 60 * 1000; } /* @@ -1743,12 +1725,9 @@ ServerLoop(void) for (;;) { time_t now; - struct timeval timeout; - - DetermineSleepTime(&timeout); nevents = WaitEventSetWait(pm_wait_set, - timeout.tv_sec * 1000 + timeout.tv_usec / 1000, + DetermineSleepTime(), events, lengthof(events), 0 /* postmaster posts no wait_events */ ); -- 2.38.1