mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-02-19 01:18:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use monotonic timestamp to calculate timeouts refs #23826 (#23834)

Browse Source 
Related to #23826. This address issues raised
[here](https://github.com/nim-lang/Nim/pull/23826#issuecomment-2226877361)
by using a monotonic timestamp to calculate timeouts and increasing the
max sleep time to 50ms.
This commit is contained in:
Mark Leyva
2024-07-15 05:10:31 -07:00
committed by GitHub
parent f6aeca5765
commit a5186a9d8b
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/pure/osproc.nim
View File

@@ -1353,7 +1353,8 @@ elif not defined(useNimRtl):
result = exitStatusLikeShell(p.exitStatus)
else:
import std/times
import std/times except getTime
import std/monotimes
proc waitForExit(p: Process, timeout: int = -1): int =
if p.exitFlag:
@@ -1369,10 +1370,10 @@ elif not defined(useNimRtl):
p.exitFlag = true
p.exitStatus = status
else:
# Max 1ms delay
const maxWait = initDuration(milliseconds = 1)
# Max 50ms delay
const maxWait = initDuration(milliseconds = 50)
let wait = initDuration(milliseconds = timeout)
let deadline = getTime() + wait
let deadline = getMonoTime() + wait
# starting 50μs delay
var delay = initDuration(microseconds = 50)
@@ -1387,7 +1388,7 @@ elif not defined(useNimRtl):
raiseOsError(osLastError())
else:
# Continue waiting if needed
if getTime() >= deadline:
if getMonoTime() >= deadline:
# Previous version of `waitForExit`
# foricibly killed the process.
# We keep this so we don't break programs
@@ -1395,14 +1396,19 @@ elif not defined(useNimRtl):
if posix.kill(p.id, SIGKILL) < 0:
raiseOSError(osLastError())
else:
let newWait = getTime() + delay
const max = 1_000_000_000
let
newWait = getMonoTime() + delay
ticks = newWait.ticks()
ns = ticks mod max
secs = ticks div max
var
waitSpec: TimeSpec
unused: Timespec
waitSpec.tv_sec = posix.Time(newWait.toUnix())
waitSpec.tv_nsec = newWait.nanosecond.clong
discard posix.clock_nanosleep(CLOCK_REALTIME, TIMER_ABSTIME, waitSpec, unused)
let remaining = deadline - getTime()
waitSpec.tv_sec = posix.Time(secs)
waitSpec.tv_nsec = ns
discard posix.clock_nanosleep(CLOCK_MONOTONIC, TIMER_ABSTIME, waitSpec, unused)
let remaining = deadline - getMonoTime()
delay = min([delay * 2, remaining, maxWait])
result = exitStatusLikeShell(p.exitStatus)