OLD | NEW |
---|---|
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/logging.h" | 7 #include "base/logging.h" |
8 #include "base/values.h" | 8 #include "base/values.h" |
9 | 9 |
10 namespace base { | 10 namespace base { |
(...skipping 22 matching lines...) Expand all Loading... | |
33 | 33 |
34 res->SetInteger("committed_memory", static_cast<int>(committed_memory_)); | 34 res->SetInteger("committed_memory", static_cast<int>(committed_memory_)); |
35 #if defined(OS_LINUX) || defined(OS_ANDROID) | 35 #if defined(OS_LINUX) || defined(OS_ANDROID) |
36 res->Set("meminfo", memory_info_.ToValue()); | 36 res->Set("meminfo", memory_info_.ToValue()); |
37 res->Set("diskinfo", disk_info_.ToValue()); | 37 res->Set("diskinfo", disk_info_.ToValue()); |
38 #endif | 38 #endif |
39 #if defined(OS_CHROMEOS) | 39 #if defined(OS_CHROMEOS) |
40 res->Set("swapinfo", swap_info_.ToValue()); | 40 res->Set("swapinfo", swap_info_.ToValue()); |
41 #endif | 41 #endif |
42 | 42 |
43 return res.Pass(); | 43 return std::move(res); |
Lei Zhang
2015/11/25 00:55:04
#include <utility> ? You've been mostly consistent
danakj
2015/11/25 01:01:45
Yep! Thanks
| |
44 } | 44 } |
45 | 45 |
46 ProcessMetrics* ProcessMetrics::CreateCurrentProcessMetrics() { | 46 ProcessMetrics* ProcessMetrics::CreateCurrentProcessMetrics() { |
47 #if !defined(OS_MACOSX) || defined(OS_IOS) | 47 #if !defined(OS_MACOSX) || defined(OS_IOS) |
48 return CreateProcessMetrics(base::GetCurrentProcessHandle()); | 48 return CreateProcessMetrics(base::GetCurrentProcessHandle()); |
49 #else | 49 #else |
50 return CreateProcessMetrics(base::GetCurrentProcessHandle(), nullptr); | 50 return CreateProcessMetrics(base::GetCurrentProcessHandle(), nullptr); |
51 #endif // !defined(OS_MACOSX) || defined(OS_IOS) | 51 #endif // !defined(OS_MACOSX) || defined(OS_IOS) |
52 } | 52 } |
53 | 53 |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
86 return (wakeups_delta_for_ms + time_delta / 2) / time_delta; | 86 return (wakeups_delta_for_ms + time_delta / 2) / time_delta; |
87 } | 87 } |
88 #else | 88 #else |
89 int ProcessMetrics::GetIdleWakeupsPerSecond() { | 89 int ProcessMetrics::GetIdleWakeupsPerSecond() { |
90 NOTIMPLEMENTED(); // http://crbug.com/120488 | 90 NOTIMPLEMENTED(); // http://crbug.com/120488 |
91 return 0; | 91 return 0; |
92 } | 92 } |
93 #endif // defined(OS_MACOSX) || defined(OS_LINUX) | 93 #endif // defined(OS_MACOSX) || defined(OS_LINUX) |
94 | 94 |
95 } // namespace base | 95 } // namespace base |
OLD | NEW |