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