Fix (PID Reaping): Ensure we don't wait unnecessarily on a zombie pro…

…cess
maleyva1 · Jun 29, 2024 · 887f4cc · 887f4cc
1 parent b9295c1
commit 887f4cc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/pure/osproc.nim b/lib/pure/osproc.nim
@@ -1383,8 +1383,7 @@ elif not defined(useNimRtl):
         s.tv_sec = b.tv_sec
         s.tv_nsec = b.tv_nsec
 
-      # Ensure we don't wait on an exited process
-      if not(p.running()) and p.exitFlag:
+      if p.exitFlag:
         return exitStatusLikeShell(p.exitStatus)
 
       if timeout == -1:
@@ -1417,6 +1416,8 @@ elif not defined(useNimRtl):
           tmspec.tv_nsec = (timeout * 1_000_000)
 
         try:
+          if not running(p):
+            return exitStatusLikeShell(p.exitStatus)
           if clock_gettime(CLOCK_REALTIME, stspec) == -1:
             raiseOSError(osLastError())
           while true:

diff --git a/tests/osproc/twaitforexit.nim b/tests/osproc/twaitforexit.nim
@@ -12,7 +12,7 @@ block: # bug #5091
         try:
             discard waitForExit(p, msWait)
         except OSError:
-            echo getCurrentExceptionMsg()
+            discard
 
         # check that we don't have to wait msWait milliseconds
         doAssert(getTime() <  atStart + milliseconds(msWait))