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

🎨 Use snake case

Browse source
This commit is contained in:
Kevin Sawicki 2017-05-04 13:27:35 -07:00
parent 07b53c0284
commit e206aae9fc
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
atom/browser/api/atom_api_app.cc
View file

@ -925,11 +925,11 @@ void App::GetFileIcon(const base::FilePath& path,
std::vector<mate::Dictionary> App::GetAppMemoryInfo(v8::Isolate* isolate) { std::vector<mate::Dictionary> App::GetAppMemoryInfo(v8::Isolate* isolate) {
AppIdProcessIterator process_iterator; AppIdProcessIterator process_iterator;
auto processEntry = process_iterator.NextProcessEntry(); auto process_entry = process_iterator.NextProcessEntry();
std::vector<mate::Dictionary> result; std::vector<mate::Dictionary> result;
while (processEntry != nullptr) { while (process_entry != nullptr) {
int64_t pid = processEntry->pid(); int64_t pid = process_entry->pid();
auto process = base::Process::OpenWithExtraPrivileges(pid); auto process = base::Process::OpenWithExtraPrivileges(pid);
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
@ -941,24 +941,24 @@ std::vector<mate::Dictionary> App::GetAppMemoryInfo(v8::Isolate* isolate) {
base::ProcessMetrics::CreateProcessMetrics(process.Handle())); base::ProcessMetrics::CreateProcessMetrics(process.Handle()));
#endif #endif
mate::Dictionary pidDict = mate::Dictionary::CreateEmpty(isolate); mate::Dictionary pid_dict = mate::Dictionary::CreateEmpty(isolate);
mate::Dictionary memoryDict = mate::Dictionary::CreateEmpty(isolate); mate::Dictionary memory_dict = mate::Dictionary::CreateEmpty(isolate);
memoryDict.Set("workingSetSize", memory_dict.Set("workingSetSize",
static_cast<double>(metrics->GetWorkingSetSize() >> 10)); static_cast<double>(metrics->GetWorkingSetSize() >> 10));
memoryDict.Set("peakWorkingSetSize", memory_dict.Set("peakWorkingSetSize",
static_cast<double>(metrics->GetPeakWorkingSetSize() >> 10)); static_cast<double>(metrics->GetPeakWorkingSetSize() >> 10));
size_t private_bytes, shared_bytes; size_t private_bytes, shared_bytes;
if (metrics->GetMemoryBytes(&private_bytes, &shared_bytes)) { if (metrics->GetMemoryBytes(&private_bytes, &shared_bytes)) {
memoryDict.Set("privateBytes", static_cast<double>(private_bytes >> 10)); memory_dict.Set("privateBytes", static_cast<double>(private_bytes >> 10));
memoryDict.Set("sharedBytes", static_cast<double>(shared_bytes >> 10)); memory_dict.Set("sharedBytes", static_cast<double>(shared_bytes >> 10));
} }
pidDict.Set("memory", memoryDict); pid_dict.Set("memory", memory_dict);
pidDict.Set("pid", std::to_string(pid)); pid_dict.Set("pid", std::to_string(pid));
result.push_back(pidDict); result.push_back(pid_dict);
processEntry = process_iterator.NextProcessEntry(); process_entry = process_iterator.NextProcessEntry();
} }
return result; return result;