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

Side by Side Diff: base/sys_info_win.cc

Issue 2558043007: Fix free memory calculation. (Closed)
Patch Set: Fix integer overflow in unittest. Created 3 years, 9 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/sys_info_unittest.cc ('k') | chrome/browser/ui/webui/about_ui.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 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
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 return 0;
75 return static_cast<int64_t>(info.avail_phys) * 1024;
72 } 76 }
73 77
74 // static 78 // static
75 int64_t SysInfo::AmountOfVirtualMemory() { 79 int64_t SysInfo::AmountOfVirtualMemory() {
76 return AmountOfMemory(&MEMORYSTATUSEX::ullTotalVirtual); 80 return AmountOfMemory(&MEMORYSTATUSEX::ullTotalVirtual);
77 } 81 }
78 82
79 // static 83 // static
80 int64_t SysInfo::AmountOfFreeDiskSpace(const FilePath& path) { 84 int64_t SysInfo::AmountOfFreeDiskSpace(const FilePath& path) {
81 ThreadRestrictions::AssertIOAllowed(); 85 ThreadRestrictions::AssertIOAllowed();
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 void SysInfo::OperatingSystemVersionNumbers(int32_t* major_version, 154 void SysInfo::OperatingSystemVersionNumbers(int32_t* major_version,
151 int32_t* minor_version, 155 int32_t* minor_version,
152 int32_t* bugfix_version) { 156 int32_t* bugfix_version) {
153 win::OSInfo* os_info = win::OSInfo::GetInstance(); 157 win::OSInfo* os_info = win::OSInfo::GetInstance();
154 *major_version = os_info->version_number().major; 158 *major_version = os_info->version_number().major;
155 *minor_version = os_info->version_number().minor; 159 *minor_version = os_info->version_number().minor;
156 *bugfix_version = 0; 160 *bugfix_version = 0;
157 } 161 }
158 162
159 } // namespace base 163 } // namespace base
OLDNEW
« no previous file with comments | « base/sys_info_unittest.cc ('k') | chrome/browser/ui/webui/about_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698