Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(91)

Side by Side Diff: base/process/process_metrics.cc

Issue 23155002: Implement ToValue() for SystemMetrics, SystemMemoryInfoKB, DiskInfo, and SwapInfo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@meminfo
Patch Set: cast size_t to int Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « base/process/process_metrics.h ('k') | base/process/process_metrics_linux.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/process/process_metrics.h" 5 #include "base/process/process_metrics.h"
6 6
7 #include "base/values.h" 7 #include "base/values.h"
8 8
9 namespace base { 9 namespace base {
10 10
11 SystemMetrics::SystemMetrics() { 11 SystemMetrics::SystemMetrics() {
12 committed_memory_ = 0; 12 committed_memory_ = 0;
13 } 13 }
14 14
15 SystemMetrics SystemMetrics::Sample() { 15 SystemMetrics SystemMetrics::Sample() {
16 SystemMetrics system_metrics; 16 SystemMetrics system_metrics;
17 17
18 system_metrics.committed_memory_ = GetSystemCommitCharge(); 18 system_metrics.committed_memory_ = GetSystemCommitCharge();
19 #if defined(OS_LINUX) || defined(OS_ANDROID) 19 #if defined(OS_LINUX) || defined(OS_ANDROID)
20 GetSystemMemoryInfo(&system_metrics.memory_info_); 20 GetSystemMemoryInfo(&system_metrics.memory_info_);
21 GetSystemDiskInfo(&system_metrics.disk_info_); 21 GetSystemDiskInfo(&system_metrics.disk_info_);
22 #endif 22 #endif
23 #if defined(OS_CHROMEOS) 23 #if defined(OS_CHROMEOS)
24 GetSwapInfo(&system_metrics.swap_info_); 24 GetSwapInfo(&system_metrics.swap_info_);
25 #endif 25 #endif
26 26
27 return system_metrics; 27 return system_metrics;
28 } 28 }
29 29
30 scoped_ptr<Value> SystemMetrics::ToValue() const {
31 scoped_ptr<DictionaryValue> res(new DictionaryValue());
32
33 res->SetInteger("committed_memory", static_cast<int>(committed_memory_));
34 #if defined(OS_LINUX) || defined(OS_ANDROID)
35 res->Set("meminfo", memory_info_.ToValue().release());
36 res->Set("diskinfo", disk_info_.ToValue().release());
37 #endif
38 #if defined(OS_CHROMEOS)
39 res->Set("swapinfo", swap_info_.ToValue().release());
40 #endif
41
42 return res.PassAs<Value>();
43 }
44
30 } // namespace base 45 } // namespace base
OLDNEW
« no previous file with comments | « base/process/process_metrics.h ('k') | base/process/process_metrics_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698