Changeset View
Changeset View
Standalone View
Standalone View
head/www/chromium/files/patch-base_system_sys__info__freebsd.cc
| --- base/system/sys_info_freebsd.cc.orig 2019-12-16 21:50:40 UTC | --- base/system/sys_info_freebsd.cc.orig 2020-06-15 18:59:42 UTC | ||||
| +++ base/system/sys_info_freebsd.cc | +++ base/system/sys_info_freebsd.cc | ||||
| @@ -13,26 +13,59 @@ | @@ -9,30 +9,76 @@ | ||||
| #include <sys/sysctl.h> | |||||
| #include "base/logging.h" | |||||
| +#include "base/strings/string_util.h" | |||||
| namespace base { | namespace base { | ||||
| int64_t SysInfo::AmountOfPhysicalMemoryImpl() { | int64_t SysInfo::AmountOfPhysicalMemoryImpl() { | ||||
| - int pages, page_size; | - int pages, page_size; | ||||
| + int pages, page_size, r = 0; | + int pages, page_size, r = 0; | ||||
| size_t size = sizeof(pages); | size_t size = sizeof(pages); | ||||
| - sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0); | - sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0); | ||||
| - sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0); | - sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0); | ||||
| ▲ Show 20 Lines • Show All 45 Lines • ▼ Show 20 Lines | uint64_t SysInfo::MaxSharedMemorySize() { | ||||
| size_t size = sizeof(limit); | size_t size = sizeof(limit); | ||||
| + | + | ||||
| if (sysctlbyname("kern.ipc.shmmax", &limit, &size, NULL, 0) < 0) { | if (sysctlbyname("kern.ipc.shmmax", &limit, &size, NULL, 0) < 0) { | ||||
| NOTREACHED(); | NOTREACHED(); | ||||
| return 0; | return 0; | ||||
| } | } | ||||
| + | + | ||||
| return static_cast<uint64_t>(limit); | return static_cast<uint64_t>(limit); | ||||
| +} | |||||
| + | |||||
| +SysInfo::HardwareInfo SysInfo::GetHardwareInfoSync() { | |||||
| + HardwareInfo info; | |||||
| + // Set the manufacturer to "FreeBSD" and the model to | |||||
| + // an empty string. | |||||
| + info.manufacturer = "FreeBSD"; | |||||
| + info.model = HardwareModelName(); | |||||
| + DCHECK(IsStringUTF8(info.manufacturer)); | |||||
| + DCHECK(IsStringUTF8(info.model)); | |||||
| + return info; | |||||
| } | } | ||||
| - | |||||
| } // namespace base | } // namespace base | ||||