| ... | ... | @@ -280,10 +280,7 @@ pub const ChildProcess = struct { |
| 280 | 280 | } |
| 281 | 281 | |
| 282 | 282 | fn cleanupAfterWait(self: *ChildProcess, status: u32) !Term { |
| 283 | | defer { |
| 284 | | os.close(self.err_pipe[0]); |
| 285 | | os.close(self.err_pipe[1]); |
| 286 | | } |
| 283 | defer destroyPipe(self.err_pipe); |
| 287 | 284 | |
| 288 | 285 | // Write maxInt(ErrInt) to the write end of the err_pipe. This is after |
| 289 | 286 | // waitpid, so this write is guaranteed to be after the child |
| ... | ... | @@ -359,7 +356,16 @@ pub const ChildProcess = struct { |
| 359 | 356 | |
| 360 | 357 | // This pipe is used to communicate errors between the time of fork |
| 361 | 358 | // and execve from the child process to the parent process. |
| 362 | | const err_pipe = try os.pipe(); |
| 359 | const err_pipe = blk: { |
| 360 | if (builtin.os == .linux) { |
| 361 | const fd = try os.eventfd(0, 0); |
| 362 | // There's no distinction between the readable and the writeable |
| 363 | // end with eventfd |
| 364 | break :blk [2]os.fd_t{ fd, fd }; |
| 365 | } else { |
| 366 | break :blk try os.pipe(); |
| 367 | } |
| 368 | }; |
| 363 | 369 | errdefer destroyPipe(err_pipe); |
| 364 | 370 | |
| 365 | 371 | const pid_result = try os.fork(); |
| ... | ... | @@ -773,7 +779,7 @@ fn windowsMakePipeOut(rd: *?windows.HANDLE, wr: *?windows.HANDLE, sattr: *const |
| 773 | 779 | |
| 774 | 780 | fn destroyPipe(pipe: [2]os.fd_t) void { |
| 775 | 781 | os.close(pipe[0]); |
| 776 | | os.close(pipe[1]); |
| 782 | if (pipe[0] != pipe[1]) os.close(pipe[1]); |
| 777 | 783 | } |
| 778 | 784 | |
| 779 | 785 | // Child of fork calls this to report an error to the fork parent. |
| ... | ... | @@ -787,12 +793,12 @@ const ErrInt = @IntType(false, @sizeOf(anyerror) * 8); |
| 787 | 793 | |
| 788 | 794 | fn writeIntFd(fd: i32, value: ErrInt) !void { |
| 789 | 795 | const stream = &File.openHandle(fd).outStream().stream; |
| 790 | | stream.writeIntNative(ErrInt, value) catch return error.SystemResources; |
| 796 | stream.writeIntNative(u64, @intCast(u64, value)) catch return error.SystemResources; |
| 791 | 797 | } |
| 792 | 798 | |
| 793 | 799 | fn readIntFd(fd: i32) !ErrInt { |
| 794 | 800 | const stream = &File.openHandle(fd).inStream().stream; |
| 795 | | return stream.readIntNative(ErrInt) catch return error.SystemResources; |
| 801 | return @intCast(ErrInt, stream.readIntNative(u64) catch return error.SystemResources); |
| 796 | 802 | } |
| 797 | 803 | |
| 798 | 804 | /// Caller must free result. |
LemonBoy <thatlemon@gmail.com> 2019-12-15 16:47:48+01:00
Andrew Kelley <andrew@ziglang.org> 2019-12-15 14:43:37-05:00