summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/bindings.rs59
1 files changed, 4 insertions, 55 deletions
diff --git a/core/bindings.rs b/core/bindings.rs
index 46c542933..afa4fbbf3 100644
--- a/core/bindings.rs
+++ b/core/bindings.rs
@@ -875,64 +875,13 @@ fn heap_stats(
_args: v8::FunctionCallbackArguments,
mut rv: v8::ReturnValue,
) {
- fn set_prop(
- scope: &mut v8::HandleScope,
- obj: v8::Local<v8::Object>,
- name: &'static str,
- value: usize,
- ) {
- let key = v8::String::new(scope, name).unwrap();
- let val = v8::Number::new(scope, value as f64);
- obj.set(scope, key.into(), val.into());
- }
-
- let s = get_heap_stats(scope);
-
- // TODO: use serde for this once we have serde_v8
- let obj = v8::Object::new(scope);
- set_prop(scope, obj, "totalHeapSize", s.total_heap_size);
- set_prop(
- scope,
- obj,
- "totalHeapSizexecutable",
- s.total_heap_size_executable,
- );
- set_prop(scope, obj, "totalPhysicalSize", s.total_physical_size);
- set_prop(scope, obj, "totalAvailableSize", s.total_available_size);
- set_prop(
- scope,
- obj,
- "totalGlobalHandlesSize",
- s.total_global_handles_size,
- );
- set_prop(
- scope,
- obj,
- "usedGlobalHandlesSize",
- s.used_global_handles_size,
- );
- set_prop(scope, obj, "usedHeapSize", s.used_heap_size);
- set_prop(scope, obj, "heapSizeLimit", s.heap_size_limit);
- set_prop(scope, obj, "mallocedMemory", s.malloced_memory);
- set_prop(scope, obj, "externalMemory", s.external_memory);
- set_prop(scope, obj, "peakMallocedMemory", s.peak_malloced_memory);
- set_prop(
- scope,
- obj,
- "numberOfNativeContexts",
- s.number_of_native_contexts,
- );
- set_prop(
- scope,
- obj,
- "numberOfDetachedContexts",
- s.number_of_detached_contexts,
- );
-
- rv.set(obj.into());
+ let stats = get_heap_stats(scope);
+ rv.set(to_v8(scope, stats).unwrap());
}
// HeapStats stores values from a isolate.get_heap_statistics() call
+#[derive(Serialize)]
+#[serde(rename_all = "camelCase")]
struct HeapStats {
total_heap_size: usize,
total_heap_size_executable: usize,