diff options
| -rw-r--r-- | src/bun.js/bindings/BunJSCModule.cpp | 17 | ||||
| -rw-r--r-- | types/bun/jsc.d.ts | 1 |
2 files changed, 16 insertions, 2 deletions
diff --git a/src/bun.js/bindings/BunJSCModule.cpp b/src/bun.js/bindings/BunJSCModule.cpp index b81f2db93..dd5c4b062 100644 --- a/src/bun.js/bindings/BunJSCModule.cpp +++ b/src/bun.js/bindings/BunJSCModule.cpp @@ -197,8 +197,21 @@ const ClassInfo JSCMemoryFootprint::s_info = { "MemoryFootprint"_s, &Base::s_inf JSC_DECLARE_HOST_FUNCTION(functionMemoryUsageStatistics); JSC_DEFINE_HOST_FUNCTION(functionMemoryUsageStatistics, (JSGlobalObject * globalObject, CallFrame*)) { - auto contextRef = toRef(globalObject); - return JSValue::encode(toJS(JSGetMemoryUsageStatistics(contextRef))); + + auto& vm = globalObject->vm(); + JSC::DisallowGC disallowGC; + + // this is a C API function + auto* stats = toJS(JSGetMemoryUsageStatistics(toRef(globalObject))); + + // This is missing from the C API + JSC::JSObject* protectedCounts = constructEmptyObject(globalObject); + auto typeCounts = *vm.heap.protectedObjectTypeCounts(); + for (auto& it : typeCounts) + protectedCounts->putDirect(vm, Identifier::fromLatin1(vm, it.key), jsNumber(it.value)); + + stats->putDirect(vm, Identifier::fromLatin1(vm, "protectedObjectTypeCounts"_s), protectedCounts); + return JSValue::encode(stats); } JSC_DECLARE_HOST_FUNCTION(functionCreateMemoryFootprint); diff --git a/types/bun/jsc.d.ts b/types/bun/jsc.d.ts index b59f8adee..0b377ef8e 100644 --- a/types/bun/jsc.d.ts +++ b/types/bun/jsc.d.ts @@ -14,6 +14,7 @@ declare module "bun:jsc" { globalObjectCount: number; protectedGlobalObjectCount: number; objectTypeCounts: Record<string, number>; + protectedObjectTypeCounts: Record<string, number>; }; export function memoryUsage(): { current: number; |