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

Side by Side Diff: base/sys_info_ios.mm

Issue 2558043007: Fix free memory calculation. (Closed)
Patch Set: Fix various things again. 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <mach/mach.h> 7 #include <mach/mach.h>
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 #include <sys/sysctl.h> 10 #include <sys/sysctl.h>
11 #include <sys/types.h> 11 #include <sys/types.h>
12 #import <UIKit/UIKit.h> 12 #import <UIKit/UIKit.h>
13 13
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/mac/scoped_mach_port.h" 15 #include "base/mac/scoped_mach_port.h"
16 #include "base/mac/scoped_nsautorelease_pool.h" 16 #include "base/mac/scoped_nsautorelease_pool.h"
17 #include "base/macros.h" 17 #include "base/macros.h"
18 #include "base/process/process_metrics.h"
18 #include "base/strings/sys_string_conversions.h" 19 #include "base/strings/sys_string_conversions.h"
19 20
20 namespace base { 21 namespace base {
21 22
22 // static 23 // static
23 std::string SysInfo::OperatingSystemName() { 24 std::string SysInfo::OperatingSystemName() {
24 static dispatch_once_t get_system_name_once; 25 static dispatch_once_t get_system_name_once;
25 static std::string* system_name; 26 static std::string* system_name;
26 dispatch_once(&get_system_name_once, ^{ 27 dispatch_once(&get_system_name_once, ^{
27 base::mac::ScopedNSAutoreleasePool pool; 28 base::mac::ScopedNSAutoreleasePool pool;
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 if (result != KERN_SUCCESS) { 77 if (result != KERN_SUCCESS) {
77 NOTREACHED(); 78 NOTREACHED();
78 return 0; 79 return 0;
79 } 80 }
80 DCHECK_EQ(HOST_BASIC_INFO_COUNT, count); 81 DCHECK_EQ(HOST_BASIC_INFO_COUNT, count);
81 return static_cast<int64_t>(hostinfo.max_mem); 82 return static_cast<int64_t>(hostinfo.max_mem);
82 } 83 }
83 84
84 // static 85 // static
85 int64_t SysInfo::AmountOfAvailablePhysicalMemory() { 86 int64_t SysInfo::AmountOfAvailablePhysicalMemory() {
86 base::mac::ScopedMachSendRight host(mach_host_self()); 87 SystemMemoryInfoKB info;
87 vm_statistics_data_t vm_info; 88 if (!GetSystemMemoryInfo(&info))
88 mach_msg_type_number_t count = HOST_VM_INFO_COUNT;
89 if (host_statistics(host.get(),
90 HOST_VM_INFO,
91 reinterpret_cast<host_info_t>(&vm_info),
92 &count) != KERN_SUCCESS) {
93 NOTREACHED();
94 return 0; 89 return 0;
95 } 90 // We should add inactive file-backed memory also but there is no such
96 91 // information from iOS unfortunately.
97 return static_cast<int64_t>(vm_info.free_count - vm_info.speculative_count) * 92 return static_cast<int64_t>(info.free + info.speculative) * 1024;
98 PAGE_SIZE;
99 } 93 }
100 94
101 // static 95 // static
102 std::string SysInfo::CPUModelName() { 96 std::string SysInfo::CPUModelName() {
103 char name[256]; 97 char name[256];
104 size_t len = arraysize(name); 98 size_t len = arraysize(name);
105 if (sysctlbyname("machdep.cpu.brand_string", &name, &len, NULL, 0) == 0) 99 if (sysctlbyname("machdep.cpu.brand_string", &name, &len, NULL, 0) == 0)
106 return name; 100 return name;
107 return std::string(); 101 return std::string();
108 } 102 }
109 103
110 } // namespace base 104 } // namespace base
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698