github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-24 14:57:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Everything is in KB

Browse Source
This commit is contained in:
Paul Betts
2016-05-13 17:56:40 -07:00
parent 191b054ff0
commit 75362450cd
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
atom/common/api/atom_api_process_stats.cc
View File

@@ -18,13 +18,13 @@ v8::Local<v8::Value> GetProcessMetrics(v8::Isolate* isolate) {
std::unique_ptr<base::ProcessMetrics> metrics(
base::ProcessMetrics::CreateCurrentProcessMetrics());
dict.Set("workingSetSize", (double)metrics->GetWorkingSetSize());
dict.Set("peakWorkingSetSize", (double)metrics->GetPeakWorkingSetSize());
dict.Set("workingSetSize", (double)(metrics->GetWorkingSetSize() >> 10));
dict.Set("peakWorkingSetSize", (double)(metrics->GetPeakWorkingSetSize() >> 10));
size_t private_bytes, shared_bytes;
if (metrics->GetMemoryBytes(&private_bytes, &shared_bytes)) {
dict.set("privateBytes", (double)private_bytes);
dict.set("sharedBytes", (double)shared_bytes);
dict.Set("privateBytes", (double)(private_bytes >> 10));
dict.Set("sharedBytes", (double)(shared_bytes >> 10));
}
return dict.GetHandle();
@@ -39,13 +39,13 @@ v8::Local<v8::Value> GetSystemMemoryInfo(v8::Isolate* isolate, mate::Arguments*
return v8::Undefined(isolate);
}
dict.set("total", memInfo.total);
dict.set("free", memInfo.free);
dict.Set("total", memInfo.total);
dict.Set("free", memInfo.free);
// NB: These return bogus values on OS X
#if !DEFINED(OS_MACOSX)
dict.set("swapTotal", memInfo.swap_total);
dict.set("swapFree", memInfo.swap_free);
#if !defined(OS_MACOSX)
dict.Set("swapTotal", memInfo.swap_total);
dict.Set("swapFree", memInfo.swap_free);
#endif
return dict.GetHandle();