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

Add js.gc.take to code generator

Browse Source
This commit is contained in:
Jarred Sumner
2025-08-22 21:46:30 -07:00
parent b2351bbb4e
commit 3c81a699ee
2 changed files with 19 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -581,30 +581,6 @@ pub fn memoryCost(this: *const Subprocess) usize {
this.stderr.memoryCost();
}
fn consumeExitedPromise(this_jsvalue: JSValue, globalThis: *jsc.JSGlobalObject) ?JSValue {
if (jsc.Codegen.JSSubprocess.exitedPromiseGetCached(this_jsvalue)) |promise| {
jsc.Codegen.JSSubprocess.exitedPromiseSetCached(this_jsvalue, globalThis, .zero);
return promise;
}
return null;
}
fn consumeOnExitCallback(this_jsvalue: JSValue, globalThis: *jsc.JSGlobalObject) ?JSValue {
if (jsc.Codegen.JSSubprocess.onExitCallbackGetCached(this_jsvalue)) |callback| {
jsc.Codegen.JSSubprocess.onExitCallbackSetCached(this_jsvalue, globalThis, .zero);
return callback;
}
return null;
}
fn consumeOnDisconnectCallback(this_jsvalue: JSValue, globalThis: *jsc.JSGlobalObject) ?JSValue {
if (jsc.Codegen.JSSubprocess.onDisconnectCallbackGetCached(this_jsvalue)) |callback| {
jsc.Codegen.JSSubprocess.onDisconnectCallbackSetCached(this_jsvalue, globalThis, .zero);
return callback;
}
return null;
}
pub fn onProcessExit(this: *Subprocess, process: *Process, status: bun.spawn.Status, rusage: *const Rusage) void {
log("onProcessExit()", .{});
const this_jsvalue = this.this_jsvalue;
@@ -687,7 +663,7 @@ pub fn onProcessExit(this: *Subprocess, process: *Process, status: bun.spawn.Sta
if (!is_sync) {
if (this_jsvalue != .zero) {
if (consumeExitedPromise(this_jsvalue, globalThis)) |promise| {
if (js.gc.exitedPromise.take(this_jsvalue, globalThis)) |promise| {
loop.enter();
defer loop.exit();
@@ -708,7 +684,7 @@ pub fn onProcessExit(this: *Subprocess, process: *Process, status: bun.spawn.Sta
}
}
if (consumeOnExitCallback(this_jsvalue, globalThis)) |callback| {
if (js.gc.onExitCallback.take(this_jsvalue, globalThis)) |callback| {
const waitpid_value: JSValue =
if (status == .err)
status.err.toJS(globalThis)
@@ -1801,7 +1777,7 @@ pub fn handleIPCClose(this: *Subprocess) void {
jsc.Codegen.JSSubprocess.ipcCallbackSetCached(this_jsvalue, globalThis, .zero);
// Call the onDisconnectCallback if it exists and prevent it from being kept alive longer than necessary
if (consumeOnDisconnectCallback(this_jsvalue, globalThis)) |callback| {
if (js.gc.onDisconnectCallback.take(this_jsvalue, globalThis)) |callback| {
globalThis.bunVM().eventLoop().runCallback(callback, globalThis, this_jsvalue, &.{.true});
}
}

16
src/codegen/generate-classes.ts
View File

@@ -1897,6 +1897,22 @@ function generateZig(
field.set(thisValue, globalObject, .zero);
}
pub fn take(comptime field: gc, thisValue: jsc.JSValue, globalObject: *jsc.JSGlobalObject) ?jsc.JSValue {
switch (field) {
${gc_fields
.map(
([name]) =>
` .${name} => {
const value = ${protoSymbolName(typeName, name)}getCachedValue(thisValue, globalObject);
if (value == .zero) return null;
${protoSymbolName(typeName, name)}SetCachedValue(thisValue, globalObject, .zero);
return value;
},`,
)
.join("\n")}
}
}
pub fn set(comptime field: gc, thisValue: jsc.JSValue, globalObject: *jsc.JSGlobalObject, value: jsc.JSValue) void {
switch (field) {
${gc_fields