From e3e93b903420247ef14c105ef1a71a0aca9cac7e Mon Sep 17 00:00:00 2001 From: Nitish Sakhawalkar Date: Wed, 31 Oct 2018 14:21:00 -0700 Subject: [PATCH] Update API --- atom/common/api/atom_bindings.cc | 10 ++++------ docs/api/process.md | 8 ++++---- spec/api-process-spec.js | 11 ++++------- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/atom/common/api/atom_bindings.cc b/atom/common/api/atom_bindings.cc index 956a7c4d0d465..7bbc8d3a257ff 100644 --- a/atom/common/api/atom_bindings.cc +++ b/atom/common/api/atom_bindings.cc @@ -255,13 +255,11 @@ void AtomBindings::DidReceiveMemoryDump( if (base::GetCurrentProcId() == dump.pid()) { mate::Dictionary dict = mate::Dictionary::CreateEmpty(env->isolate()); const auto& osdump = dump.os_dump(); -#if defined(OS_LINUX) - dict.Set("residentSetBytes", osdump.resident_set_kb); -#elif defined(OS_WIN) - dict.Set("workingSetSize", osdump.resident_set_kb); +#if defined(OS_LINUX) || defined(OS_WIN) + dict.Set("residentSet", osdump.resident_set_kb); #endif - dict.Set("privateBytes", osdump.private_footprint_kb); - dict.Set("sharedBytes", osdump.shared_footprint_kb); + dict.Set("private", osdump.private_footprint_kb); + dict.Set("shared", osdump.shared_footprint_kb); promise->Resolve(dict.GetHandle()); resolved = true; break; diff --git a/docs/api/process.md b/docs/api/process.md index 6aaf421c37ff7..481713cd1a0e4 100644 --- a/docs/api/process.md +++ b/docs/api/process.md @@ -162,11 +162,11 @@ Returns an object with V8 heap statistics. Note that all statistics are reported Returns `Object`: -* `residentSetBytes` Integer on _Linux_ or `workingSetSize` Integer on _Windows_ - The -amount of memory currently pinned to actual physical RAM. -* `privateBytes` Integer - The amount of memory not shared by other processes, such as +* `residentSet` Integer _Linux_ and _Windows_ - The amount of memory +currently pinned to actual physical RAM. +* `private` Integer - The amount of memory not shared by other processes, such as JS heap or HTML content. -* `sharedBytes` Integer - The amount of memory shared between processes, typically +* `shared` Integer - The amount of memory shared between processes, typically memory consumed by the Electron code itself. Returns an object giving memory usage statistics about the current process. Note diff --git a/spec/api-process-spec.js b/spec/api-process-spec.js index 4c8e275dcd26c..6c6452892f4af 100644 --- a/spec/api-process-spec.js +++ b/spec/api-process-spec.js @@ -42,15 +42,12 @@ describe('process module', () => { it('resolves promise successfully with valid data', async () => { const memoryInfo = await process.getProcessMemoryInfo() expect(memoryInfo).to.be.an('object') - if (process.platform === 'linux') { - expect(memoryInfo.residentSetBytes).to.be.a('number').greaterThan(0) + if (process.platform === 'linux' || process.platform === 'windows') { + expect(memoryInfo.residentSet).to.be.a('number').greaterThan(0) } - if (process.platform === 'windows') { - expect(memoryInfo.workingSetSize).to.be.a('number').greaterThan(0) - } - expect(memoryInfo.privateBytes).to.be.a('number').greaterThan(0) + expect(memoryInfo.private).to.be.a('number').greaterThan(0) // Shared bytes can be zero - expect(memoryInfo.sharedBytes).to.be.a('number').greaterThan(-1) + expect(memoryInfo.shared).to.be.a('number').greaterThan(-1) }) })