mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-15 05:12:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix some worker-related stability issues (#11494)

Browse Source
This commit is contained in:
Jarred Sumner
2024-06-04 23:29:21 -07:00
committed by GitHub
parent 0184097ba0
commit 2580d199a4
9 changed files with 267 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/bun.js/javascript.zig
View File

@@ -752,7 +752,7 @@ pub const VirtualMachine = struct {
return this.debugger != null;
}
pub inline fn isShuttingDown(this: *const VirtualMachine) bool {
pub fn isShuttingDown(this: *const VirtualMachine) bool {
return this.is_shutting_down;
}
@@ -924,6 +924,11 @@ pub const VirtualMachine = struct {
extern fn Bun__Process__exit(*JSC.JSGlobalObject, code: c_int) noreturn;
pub fn unhandledRejection(this: *JSC.VirtualMachine, globalObject: *JSC.JSGlobalObject, reason: JSC.JSValue, promise: JSC.JSValue) bool {
if (this.isShuttingDown()) {
Output.debugWarn("unhandledRejection during shutdown.", .{});
return true;
}
if (isBunTest) {
this.unhandled_error_counter += 1;
this.onUnhandledRejection(this, globalObject, reason);
@@ -939,6 +944,11 @@ pub const VirtualMachine = struct {
}
pub fn uncaughtException(this: *JSC.VirtualMachine, globalObject: *JSC.JSGlobalObject, err: JSC.JSValue, is_rejection: bool) bool {
if (this.isShuttingDown()) {
Output.debugWarn("uncaughtException during shutdown.", .{});
return true;
}
if (isBunTest) {
this.unhandled_error_counter += 1;
this.onUnhandledRejection(this, globalObject, err);
@@ -1066,9 +1076,13 @@ pub const VirtualMachine = struct {
}
}
pub fn scriptExecutionStatus(this: *VirtualMachine) callconv(.C) JSC.ScriptExecutionStatus {
pub fn scriptExecutionStatus(this: *const VirtualMachine) callconv(.C) JSC.ScriptExecutionStatus {
if (this.is_shutting_down) {
return .stopped;
}
if (this.worker) |worker| {
if (worker.requested_terminate) {
if (worker.hasRequestedTerminate()) {
return .stopped;
}
}
@@ -2463,7 +2477,7 @@ pub const VirtualMachine = struct {
.Internal = promise,
});
if (this.worker) |worker| {
if (worker.requested_terminate) {
if (worker.hasRequestedTerminate()) {
return error.WorkerTerminated;
}
}