mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-20 14:25:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

std.os.waitpid: also return pid of child

Browse Source 
closes #6581
This commit is contained in:
stf 2020-10-07 18:51:04 +00:00 committed by Andrew Kelley
parent 0e4c3934a0
commit 3921cb0d8d
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/std/child_process.zig
View File

@ -269,9 +269,9 @@ pub const ChildProcess = struct {
}
fn waitUnwrapped(self: *ChildProcess) void {
const status = os.waitpid(self.pid, 0);
const ret = os.waitpid(self.pid, 0);
self.cleanupStreams();
self.handleWaitResult(status);
self.handleWaitResult(ret.status);
}
fn handleWaitResult(self: *ChildProcess, status: u32) void {

11
lib/std/os.zig
View File

@ -3121,13 +3121,18 @@ pub fn getsockoptError(sockfd: fd_t) ConnectError!void {
}
}
pub fn waitpid(pid: i32, flags: u32) u32 {
pub const WaitpidRet = struct {
pid: pid_t, status: u32
};
pub fn waitpid(pid: pid_t, flags: u32) WaitpidRet {
// TODO allow implicit pointer cast from *u32 to *c_uint ?
const Status = if (builtin.link_libc) c_uint else u32;
var status: Status = undefined;
while (true) {
switch (errno(system.waitpid(pid, &status, flags))) {
0 => return @bitCast(u32, status),
const rc = system.waitpid(pid, &status, flags);
switch (errno(rc)) {
0 => return WaitpidRet{ .pid = @intCast(pid_t, rc), .status = @bitCast(u32, status) },
EINTR => continue,
ECHILD => unreachable, // The process specified does not exist. It would be a race condition to handle this error.
EINVAL => unreachable, // The options argument was invalid