OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/sys_info.h" | 5 #include "base/sys_info.h" |
6 | 6 |
7 #include <windows.h> | 7 #include <windows.h> |
8 #include <stddef.h> | 8 #include <stddef.h> |
9 #include <stdint.h> | 9 #include <stdint.h> |
10 | 10 |
11 #include <limits> | 11 #include <limits> |
12 | 12 |
13 #include "base/files/file_path.h" | 13 #include "base/files/file_path.h" |
14 #include "base/logging.h" | 14 #include "base/logging.h" |
| 15 #include "base/process/process_metrics.h" |
15 #include "base/strings/stringprintf.h" | 16 #include "base/strings/stringprintf.h" |
16 #include "base/threading/thread_restrictions.h" | 17 #include "base/threading/thread_restrictions.h" |
17 #include "base/win/windows_version.h" | 18 #include "base/win/windows_version.h" |
18 | 19 |
19 namespace { | 20 namespace { |
20 | 21 |
21 int64_t AmountOfMemory(DWORDLONG MEMORYSTATUSEX::*memory_field) { | 22 int64_t AmountOfMemory(DWORDLONG MEMORYSTATUSEX::*memory_field) { |
22 MEMORYSTATUSEX memory_info; | 23 MEMORYSTATUSEX memory_info; |
23 memory_info.dwLength = sizeof(memory_info); | 24 memory_info.dwLength = sizeof(memory_info); |
24 if (!GlobalMemoryStatusEx(&memory_info)) { | 25 if (!GlobalMemoryStatusEx(&memory_info)) { |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 return win::OSInfo::GetInstance()->processors(); | 62 return win::OSInfo::GetInstance()->processors(); |
62 } | 63 } |
63 | 64 |
64 // static | 65 // static |
65 int64_t SysInfo::AmountOfPhysicalMemory() { | 66 int64_t SysInfo::AmountOfPhysicalMemory() { |
66 return AmountOfMemory(&MEMORYSTATUSEX::ullTotalPhys); | 67 return AmountOfMemory(&MEMORYSTATUSEX::ullTotalPhys); |
67 } | 68 } |
68 | 69 |
69 // static | 70 // static |
70 int64_t SysInfo::AmountOfAvailablePhysicalMemory() { | 71 int64_t SysInfo::AmountOfAvailablePhysicalMemory() { |
71 return AmountOfMemory(&MEMORYSTATUSEX::ullAvailPhys); | 72 SystemMemoryInfoKB info; |
| 73 if (!GetSystemMemoryInfo(&info)) { |
| 74 NOTREACHED(); |
| 75 return 0; |
| 76 } |
| 77 return static_cast<int64_t>(info.available) * 1024; |
72 } | 78 } |
73 | 79 |
74 // static | 80 // static |
75 int64_t SysInfo::AmountOfVirtualMemory() { | 81 int64_t SysInfo::AmountOfVirtualMemory() { |
76 return AmountOfMemory(&MEMORYSTATUSEX::ullTotalVirtual); | 82 return AmountOfMemory(&MEMORYSTATUSEX::ullTotalVirtual); |
77 } | 83 } |
78 | 84 |
79 // static | 85 // static |
80 int64_t SysInfo::AmountOfFreeDiskSpace(const FilePath& path) { | 86 int64_t SysInfo::AmountOfFreeDiskSpace(const FilePath& path) { |
81 ThreadRestrictions::AssertIOAllowed(); | 87 ThreadRestrictions::AssertIOAllowed(); |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
150 void SysInfo::OperatingSystemVersionNumbers(int32_t* major_version, | 156 void SysInfo::OperatingSystemVersionNumbers(int32_t* major_version, |
151 int32_t* minor_version, | 157 int32_t* minor_version, |
152 int32_t* bugfix_version) { | 158 int32_t* bugfix_version) { |
153 win::OSInfo* os_info = win::OSInfo::GetInstance(); | 159 win::OSInfo* os_info = win::OSInfo::GetInstance(); |
154 *major_version = os_info->version_number().major; | 160 *major_version = os_info->version_number().major; |
155 *minor_version = os_info->version_number().minor; | 161 *minor_version = os_info->version_number().minor; |
156 *bugfix_version = 0; | 162 *bugfix_version = 0; |
157 } | 163 } |
158 | 164 |
159 } // namespace base | 165 } // namespace base |
OLD | NEW |