jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rename exitCode to exitStatus

Browse source
This commit is contained in:
Johannes Hofmann 2016-09-24 14:46:07 +02:00
commit 829b706440
1 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

36
lib/pure/osproc.nim
View file

@ -48,7 +48,7 @@ type
inHandle, outHandle, errHandle: FileHandle inHandle, outHandle, errHandle: FileHandle
inStream, outStream, errStream: Stream inStream, outStream, errStream: Stream
id: Pid id: Pid
exitCode: cint exitStatus: cint
options: set[ProcessOption] options: set[ProcessOption]
Process* = ref ProcessObj ## represents an operating system process Process* = ref ProcessObj ## represents an operating system process
@ -731,7 +731,7 @@ elif not defined(useNimRtl):
pStdin, pStdout, pStderr: array[0..1, cint] pStdin, pStdout, pStderr: array[0..1, cint]
new(result) new(result)
result.options = options result.options = options
result.exitCode = -3 # for ``waitForExit`` result.exitStatus = -3 # for ``waitForExit``
if poParentStreams notin options: if poParentStreams notin options:
if pipe(pStdin) != 0'i32 or pipe(pStdout) != 0'i32 or if pipe(pStdin) != 0'i32 or pipe(pStdout) != 0'i32 or
pipe(pStderr) != 0'i32: pipe(pStderr) != 0'i32:
@ -960,7 +960,7 @@ elif not defined(useNimRtl):
var status : cint = 1 var status : cint = 1
ret = waitpid(p.id, status, WNOHANG) ret = waitpid(p.id, status, WNOHANG)
if WIFEXITED(status): if WIFEXITED(status):
p.exitCode = status p.exitStatus = status
if ret == 0: return true # Can't establish status. Assume running. if ret == 0: return true # Can't establish status. Assume running.
result = ret == int(p.id) result = ret == int(p.id)
@ -977,12 +977,12 @@ elif not defined(useNimRtl):
import kqueue, times import kqueue, times
proc waitForExit(p: Process, timeout: int = -1): int = proc waitForExit(p: Process, timeout: int = -1): int =
if p.exitCode != -3: return p.exitCode if p.exitStatus != -3: return p.exitStatus
if timeout == -1: if timeout == -1:
var status : cint = 1 var status : cint = 1
if waitpid(p.id, status, 0) < 0: if waitpid(p.id, status, 0) < 0:
raiseOSError(osLastError()) raiseOSError(osLastError())
p.exitCode = status p.exitStatus = status
else: else:
var kqFD = kqueue() var kqFD = kqueue()
if kqFD == -1: if kqFD == -1:
@ -1015,20 +1015,20 @@ elif not defined(useNimRtl):
raiseOSError(osLastError()) raiseOSError(osLastError())
if waitpid(p.id, status, 0) < 0: if waitpid(p.id, status, 0) < 0:
raiseOSError(osLastError()) raiseOSError(osLastError())
p.exitCode = status p.exitStatus = status
break break
else: else:
if kevOut.ident == p.id.uint and kevOut.filter == EVFILT_PROC: if kevOut.ident == p.id.uint and kevOut.filter == EVFILT_PROC:
if waitpid(p.id, status, 0) < 0: if waitpid(p.id, status, 0) < 0:
raiseOSError(osLastError()) raiseOSError(osLastError())
p.exitCode = status p.exitStatus = status
break break
else: else:
raiseOSError(osLastError()) raiseOSError(osLastError())
finally: finally:
discard posix.close(kqFD) discard posix.close(kqFD)
result = int(p.exitCode) shr 8 result = int(p.exitStatus) shr 8
else: else:
import times import times
@ -1062,15 +1062,15 @@ elif not defined(useNimRtl):
s.tv_sec = b.tv_sec s.tv_sec = b.tv_sec
s.tv_nsec = b.tv_nsec s.tv_nsec = b.tv_nsec
#if waitPid(p.id, p.exitCode, 0) == int(p.id): #if waitPid(p.id, p.exitStatus, 0) == int(p.id):
# ``waitPid`` fails if the process is not running anymore. But then # ``waitPid`` fails if the process is not running anymore. But then
# ``running`` probably set ``p.exitCode`` for us. Since ``p.exitCode`` is # ``running`` probably set ``p.exitStatus`` for us. Since ``p.exitStatus`` is
# initialized with -3, wrong success exit codes are prevented. # initialized with -3, wrong success exit codes are prevented.
if p.exitCode != -3: return p.exitCode if p.exitStatus != -3: return p.exitStatus
if timeout == -1: if timeout == -1:
if waitpid(p.id, status, 0) < 0: if waitpid(p.id, status, 0) < 0:
raiseOSError(osLastError()) raiseOSError(osLastError())
p.exitCode = status p.exitStatus = status
else: else:
var nmask, omask: Sigset var nmask, omask: Sigset
var sinfo: SigInfo var sinfo: SigInfo
@ -1103,7 +1103,7 @@ elif not defined(useNimRtl):
if sinfo.si_pid == p.id: if sinfo.si_pid == p.id:
if waitpid(p.id, status, 0) < 0: if waitpid(p.id, status, 0) < 0:
raiseOSError(osLastError()) raiseOSError(osLastError())
p.exitCode = status p.exitStatus = status
break break
else: else:
# we have SIGCHLD, but not for process we are waiting, # we have SIGCHLD, but not for process we are waiting,
@ -1125,7 +1125,7 @@ elif not defined(useNimRtl):
raiseOSError(osLastError()) raiseOSError(osLastError())
if waitpid(p.id, status, 0) < 0: if waitpid(p.id, status, 0) < 0:
raiseOSError(osLastError()) raiseOSError(osLastError())
p.exitCode = status p.exitStatus = status
break break
else: else:
raiseOSError(err) raiseOSError(err)
@ -1137,17 +1137,17 @@ elif not defined(useNimRtl):
if sigprocmask(SIG_UNBLOCK, nmask, omask) == -1: if sigprocmask(SIG_UNBLOCK, nmask, omask) == -1:
raiseOSError(osLastError()) raiseOSError(osLastError())
result = int(p.exitCode) shr 8 result = int(p.exitStatus) shr 8
proc peekExitCode(p: Process): int = proc peekExitCode(p: Process): int =
var status : cint = 1 var status : cint = 1
if p.exitCode != -3: return p.exitCode if p.exitStatus != -3: return p.exitStatus
var ret = waitpid(p.id, status, WNOHANG) var ret = waitpid(p.id, status, WNOHANG)
var b = ret == int(p.id) var b = ret == int(p.id)
if b: result = -1 if b: result = -1
if WIFEXITED(status): if WIFEXITED(status):
p.exitCode = status p.exitStatus = status
result = p.exitCode.int shr 8 result = p.exitStatus.int shr 8
else: else:
result = -1 result = -1