| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 #import <Foundation/Foundation.h> | 9 #import <Foundation/Foundation.h> |
| 10 #include <mach/mach_host.h> | 10 #include <mach/mach_host.h> |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 return 0; | 89 return 0; |
| 90 // We should add inactive file-backed memory also but there is no such | 90 // We should add inactive file-backed memory also but there is no such |
| 91 // information from Mac OS unfortunately. | 91 // information from Mac OS unfortunately. |
| 92 return static_cast<int64_t>(info.free + info.speculative) * 1024; | 92 return static_cast<int64_t>(info.free + info.speculative) * 1024; |
| 93 } | 93 } |
| 94 | 94 |
| 95 // static | 95 // static |
| 96 std::string SysInfo::CPUModelName() { | 96 std::string SysInfo::CPUModelName() { |
| 97 char name[256]; | 97 char name[256]; |
| 98 size_t len = arraysize(name); | 98 size_t len = arraysize(name); |
| 99 if (sysctlbyname("machdep.cpu.brand_string", &name, &len, NULL, 0) == 0) | 99 if (sysctlbyname("machdep.cpu.brand_string", &name, &len, nullptr, 0) == 0) { |
| 100 return name; | 100 DCHECK_GE(len, 1u); |
| 101 DCHECK_EQ('\0', name[len - 1]); |
| 102 return std::string(name, len - 1); |
| 103 } |
| 101 return std::string(); | 104 return std::string(); |
| 102 } | 105 } |
| 103 | 106 |
| 107 // static |
| 104 std::string SysInfo::HardwareModelName() { | 108 std::string SysInfo::HardwareModelName() { |
| 105 char model[256]; | 109 char model[256]; |
| 106 size_t len = sizeof(model); | 110 size_t len = sizeof(model); |
| 107 if (sysctlbyname("hw.model", model, &len, NULL, 0) == 0) | 111 if (sysctlbyname("hw.model", model, &len, nullptr, 0) == 0) { |
| 108 return std::string(model, 0, len); | 112 DCHECK_GE(len, 1u); |
| 113 DCHECK_EQ('\0', model[len - 1]); |
| 114 return std::string(model, len - 1); |
| 115 } |
| 109 return std::string(); | 116 return std::string(); |
| 110 } | 117 } |
| 111 | 118 |
| 112 } // namespace base | 119 } // namespace base |
| OLD | NEW |