| OLD | NEW |
| 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 <ApplicationServices/ApplicationServices.h> | 7 #include <ApplicationServices/ApplicationServices.h> |
| 8 #include <CoreServices/CoreServices.h> | 8 #include <CoreServices/CoreServices.h> |
| 9 #include <mach/mach_host.h> | 9 #include <mach/mach_host.h> |
| 10 #include <mach/mach_init.h> | 10 #include <mach/mach_init.h> |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 reinterpret_cast<SInt32*>(minor_version)); | 39 reinterpret_cast<SInt32*>(minor_version)); |
| 40 Gestalt(gestaltSystemVersionBugFix, | 40 Gestalt(gestaltSystemVersionBugFix, |
| 41 reinterpret_cast<SInt32*>(bugfix_version)); | 41 reinterpret_cast<SInt32*>(bugfix_version)); |
| 42 } | 42 } |
| 43 | 43 |
| 44 // static | 44 // static |
| 45 int64 SysInfo::AmountOfPhysicalMemory() { | 45 int64 SysInfo::AmountOfPhysicalMemory() { |
| 46 struct host_basic_info hostinfo; | 46 struct host_basic_info hostinfo; |
| 47 mach_msg_type_number_t count = HOST_BASIC_INFO_COUNT; | 47 mach_msg_type_number_t count = HOST_BASIC_INFO_COUNT; |
| 48 base::mac::ScopedMachSendRight host(mach_host_self()); | 48 base::mac::ScopedMachSendRight host(mach_host_self()); |
| 49 int result = host_info(host, | 49 int result = host_info(host.get(), |
| 50 HOST_BASIC_INFO, | 50 HOST_BASIC_INFO, |
| 51 reinterpret_cast<host_info_t>(&hostinfo), | 51 reinterpret_cast<host_info_t>(&hostinfo), |
| 52 &count); | 52 &count); |
| 53 if (result != KERN_SUCCESS) { | 53 if (result != KERN_SUCCESS) { |
| 54 NOTREACHED(); | 54 NOTREACHED(); |
| 55 return 0; | 55 return 0; |
| 56 } | 56 } |
| 57 DCHECK_EQ(HOST_BASIC_INFO_COUNT, count); | 57 DCHECK_EQ(HOST_BASIC_INFO_COUNT, count); |
| 58 return static_cast<int64>(hostinfo.max_mem); | 58 return static_cast<int64>(hostinfo.max_mem); |
| 59 } | 59 } |
| (...skipping 27 matching lines...) Expand all Loading... |
| 87 | 87 |
| 88 std::string SysInfo::HardwareModelName() { | 88 std::string SysInfo::HardwareModelName() { |
| 89 char model[256]; | 89 char model[256]; |
| 90 size_t len = sizeof(model); | 90 size_t len = sizeof(model); |
| 91 if (sysctlbyname("hw.model", model, &len, NULL, 0) == 0) | 91 if (sysctlbyname("hw.model", model, &len, NULL, 0) == 0) |
| 92 return std::string(model, 0, len); | 92 return std::string(model, 0, len); |
| 93 return std::string(); | 93 return std::string(); |
| 94 } | 94 } |
| 95 | 95 |
| 96 } // namespace base | 96 } // namespace base |
| OLD | NEW |