mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CPU Usage requires process metrics to be preserved

Browse source
This commit is contained in:
Hari Krishna Reddy Juturu 2017-05-05 02:38:51 -07:00
parent 6980e92a00
commit d65c4fe912
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
atom/common/api/atom_bindings.cc
View file

@ -13,7 +13,6 @@
#include "atom/common/native_mate_converters/string16_converter.h" #include "atom/common/native_mate_converters/string16_converter.h"
#include "atom/common/node_includes.h" #include "atom/common/node_includes.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/process/process_metrics.h"
#include "base/sys_info.h" #include "base/sys_info.h"
#include "native_mate/dictionary.h" #include "native_mate/dictionary.h"
@ -37,6 +36,7 @@ void FatalErrorCallback(const char* location, const char* message) {
AtomBindings::AtomBindings(uv_loop_t* loop) { AtomBindings::AtomBindings(uv_loop_t* loop) {
uv_async_init(loop, &call_next_tick_async_, OnCallNextTick); uv_async_init(loop, &call_next_tick_async_, OnCallNextTick);
call_next_tick_async_.data = this; call_next_tick_async_.data = this;
metrics_ = base::ProcessMetrics::CreateCurrentProcessMetrics();
} }
AtomBindings::~AtomBindings() { AtomBindings::~AtomBindings() {
@ -53,7 +53,8 @@ void AtomBindings::BindTo(v8::Isolate* isolate,
dict.SetMethod("log", &Log); dict.SetMethod("log", &Log);
dict.SetMethod("getProcessMemoryInfo", &GetProcessMemoryInfo); dict.SetMethod("getProcessMemoryInfo", &GetProcessMemoryInfo);
dict.SetMethod("getSystemMemoryInfo", &GetSystemMemoryInfo); dict.SetMethod("getSystemMemoryInfo", &GetSystemMemoryInfo);
dict.SetMethod("getCPUUsage", &GetCPUUsage); dict.SetMethod("getCPUUsage",
base::Bind(&AtomBindings::GetCPUUsage, base::Unretained(this)));
dict.SetMethod("getIOCounters", &GetIOCounters); dict.SetMethod("getIOCounters", &GetIOCounters);
#if defined(OS_POSIX) #if defined(OS_POSIX)
dict.SetMethod("setFdLimit", &base::SetFdLimit); dict.SetMethod("setFdLimit", &base::SetFdLimit);
@ -174,16 +175,12 @@ v8::Local<v8::Value> AtomBindings::GetSystemMemoryInfo(v8::Isolate* isolate,
return dict.GetHandle(); return dict.GetHandle();
} }
// static
v8::Local<v8::Value> AtomBindings::GetCPUUsage(v8::Isolate* isolate) { v8::Local<v8::Value> AtomBindings::GetCPUUsage(v8::Isolate* isolate) {
std::unique_ptr<base::ProcessMetrics> metrics(
base::ProcessMetrics::CreateCurrentProcessMetrics());
mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate); mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
int processor_count = base::SysInfo::NumberOfProcessors(); int processor_count = base::SysInfo::NumberOfProcessors();
dict.Set("percentCPUUsage", dict.Set("percentCPUUsage",
metrics->GetPlatformIndependentCPUUsage() / processor_count); metrics_->GetPlatformIndependentCPUUsage() / processor_count);
dict.Set("idleWakeupsPerSecond", metrics->GetIdleWakeupsPerSecond()); dict.Set("idleWakeupsPerSecond", metrics_->GetIdleWakeupsPerSecond());
return dict.GetHandle(); return dict.GetHandle();
} }

4
atom/common/api/atom_bindings.h
View file

@ -8,6 +8,7 @@
#include <list> #include <list>
#include "base/macros.h" #include "base/macros.h"
#include "base/process/process_metrics.h"
#include "base/strings/string16.h" #include "base/strings/string16.h"
#include "native_mate/arguments.h" #include "native_mate/arguments.h"
#include "v8/include/v8.h" #include "v8/include/v8.h"
@ -37,7 +38,7 @@ class AtomBindings {
static v8::Local<v8::Value> GetProcessMemoryInfo(v8::Isolate* isolate); static v8::Local<v8::Value> GetProcessMemoryInfo(v8::Isolate* isolate);
static v8::Local<v8::Value> GetSystemMemoryInfo(v8::Isolate* isolate, static v8::Local<v8::Value> GetSystemMemoryInfo(v8::Isolate* isolate,
mate::Arguments* args); mate::Arguments* args);
static v8::Local<v8::Value> GetCPUUsage(v8::Isolate* isolate); v8::Local<v8::Value> GetCPUUsage(v8::Isolate* isolate);
static v8::Local<v8::Value> GetIOCounters(v8::Isolate* isolate); static v8::Local<v8::Value> GetIOCounters(v8::Isolate* isolate);
private: private:
@ -47,6 +48,7 @@ class AtomBindings {
uv_async_t call_next_tick_async_; uv_async_t call_next_tick_async_;
std::list<node::Environment*> pending_next_ticks_; std::list<node::Environment*> pending_next_ticks_;
std::unique_ptr<base::ProcessMetrics> metrics_;
DISALLOW_COPY_AND_ASSIGN(AtomBindings); DISALLOW_COPY_AND_ASSIGN(AtomBindings);
}; };