mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-09 10:28:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Subprocess.prototype.killed

Browse Source
This commit is contained in:
Jarred Sumner
2022-11-25 19:39:40 -08:00
parent b5bd98c0ef
commit d0dbafb32f
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/bun.js/api/bun/subprocess.zig
View File

@@ -267,10 +267,15 @@ pub const Subprocess = struct {
return JSValue.jsUndefined();
}
pub fn hasKilled(this: *const Subprocess) bool {
return this.killed or this.hasExited();
}
pub fn tryKill(this: *Subprocess, sig: i32) JSC.Node.Maybe(void) {
if (this.killed) {
if (this.hasKilled()) {
return .{ .result = {} };
}
this.killed = true;
if (comptime Environment.isLinux) {
// should this be handled differently?
@@ -283,12 +288,21 @@ pub const Subprocess = struct {
const rc = std.os.linux.pidfd_send_signal(this.pidfd, @intCast(u8, sig), null, 0);
if (rc != 0) {
return .{ .err = JSC.Node.Syscall.Error.fromCode(std.os.linux.getErrno(rc), .kill) };
const errno = std.os.linux.getErrno(rc);
// if the process was already killed don't throw
if (errno == .SRCH) return .{ .result = {} };
return .{ .err = JSC.Node.Syscall.Error.fromCode(errno, .kill) };
}
} else {
const err = std.c.kill(this.pid, sig);
if (err != 0) {
return .{ .err = JSC.Node.Syscall.Error.fromCode(std.c.getErrno(err), .kill) };
const errno = std.c.getErrno(err);
// if the process was already killed don't throw
if (errno == .SRCH) return .{ .result = {} };
return .{ .err = JSC.Node.Syscall.Error.fromCode(errno, .kill) };
}
}
@@ -334,7 +348,7 @@ pub const Subprocess = struct {
this: *Subprocess,
_: *JSGlobalObject,
) callconv(.C) JSValue {
return JSValue.jsBoolean(this.killed);
return JSValue.jsBoolean(this.hasKilled());
}
pub const BufferedInput = struct {