Changeset 283286 in webkit

Timestamp:

Sep 29, 2021, 5:19:07 PM (5 years ago)

Author:

basuke.suzuki@sony.com

Message:

[JSC] Add objectTypeCounts to JSGetMemoryUsageStatistics
​https://bugs.webkit.org/show_bug.cgi?id=230957

Reviewed by Yusuke Suzuki.

• API/JSBase.cpp: Added objectTypeCounts property

(JSGetMemoryUsageStatistics):

• API/JSBasePrivate.h: Added description of objectTypeCounts property
• jsc.cpp: Added memoryUsageStatistics() function

Location:

trunk/Source/JavaScriptCore

Files:

• API/JSBase.cpp (modified) (2 diffs)
• API/JSBasePrivate.h (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• jsc.cpp (modified) (5 diffs)

trunk/Source/JavaScriptCore/API/JSBase.cpp

@@ -205 +205 @@
     JSLockHolder locker(vm);
 
+    auto typeCounts = vm.heap.objectTypeCounts();
+    JSObject* objectTypeCounts = constructEmptyObject(globalObject);
+    for (auto& it : *typeCounts)
+        objectTypeCounts->putDirect(vm, Identifier::fromString(vm, it.key), jsNumber(it.value));
+
     JSObject* object = constructEmptyObject(globalObject);
     object->putDirect(vm, Identifier::fromString(vm, "heapSize"), jsNumber(vm.heap.size()));
@@ -213 +218 @@
     object->putDirect(vm, Identifier::fromString(vm, "globalObjectCount"), jsNumber(vm.heap.globalObjectCount()));
     object->putDirect(vm, Identifier::fromString(vm, "protectedGlobalObjectCount"), jsNumber(vm.heap.protectedGlobalObjectCount()));
+    object->putDirect(vm, Identifier::fromString(vm, "objectTypeCounts"), objectTypeCounts);
 
     return toRef(object);

trunk/Source/JavaScriptCore/API/JSBasePrivate.h

@@ -72 +72 @@
  globalObjectCount: current count of global GC objects
  protectedGlobalObjectCount: current count of protected global GC objects
+ objectTypeCounts: object with GC object types as keys and their current counts as values
 */
 JS_EXPORT JSObjectRef JSGetMemoryUsageStatistics(JSContextRef ctx);

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-09-29  Basuke Suzuki  <basuke.suzuki@sony.com>
+
+        [JSC] Add objectTypeCounts to JSGetMemoryUsageStatistics
+        https://bugs.webkit.org/show_bug.cgi?id=230957
+
+        Reviewed by Yusuke Suzuki.
+
+        * API/JSBase.cpp: Added objectTypeCounts property
+        (JSGetMemoryUsageStatistics):
+        * API/JSBasePrivate.h: Added description of objectTypeCounts property
+        * jsc.cpp: Added memoryUsageStatistics() function
+
 2021-09-29  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/JavaScriptCore/jsc.cpp

@@ -23 +23 @@
 #include "config.h"
 
+#include "APICast.h"
 #include "ArrayBuffer.h"
 #include "BigIntConstructor.h"
@@ -45 +46 @@
 #include "JSArray.h"
 #include "JSArrayBuffer.h"
+#include "JSBasePrivate.h"
 #include "JSBigInt.h"
 #include "JSFinalizationRegistry.h"
@@ -286 +288 @@
 static JSC_DECLARE_HOST_FUNCTION(functionEdenGC);
 static JSC_DECLARE_HOST_FUNCTION(functionHeapSize);
+static JSC_DECLARE_HOST_FUNCTION(functionMemoryUsageStatistics);
 static JSC_DECLARE_HOST_FUNCTION(functionCreateMemoryFootprint);
 static JSC_DECLARE_HOST_FUNCTION(functionResetMemoryPeak);
@@ -530 +533 @@
         addFunction(vm, "edenGC", functionEdenGC, 0);
         addFunction(vm, "gcHeapSize", functionHeapSize, 0);
+        addFunction(vm, "memoryUsageStatistics", functionMemoryUsageStatistics, 0);
         addFunction(vm, "MemoryFootprint", functionCreateMemoryFootprint, 0);
         addFunction(vm, "resetMemoryPeak", functionResetMemoryPeak, 0);
@@ -1462 +1466 @@
 const ClassInfo JSCMemoryFootprint::s_info = { "MemoryFootprint", &Base::s_info, nullptr, nullptr, CREATE_METHOD_TABLE(JSCMemoryFootprint) };
 
+JSC_DEFINE_HOST_FUNCTION(functionMemoryUsageStatistics, (JSGlobalObject* globalObject, CallFrame*))
+{
+    auto contextRef = toRef(globalObject);
+    return JSValue::encode(toJS(JSGetMemoryUsageStatistics(contextRef)));
+}
+
 JSC_DEFINE_HOST_FUNCTION(functionCreateMemoryFootprint, (JSGlobalObject* globalObject, CallFrame*))
 {