Differential D18757 Diff 55245 www/qt5-webengine/files/patch-src_3rdparty_chromium_base_sys__info__freebsd.cc
Changeset View
Changeset View
Standalone View
Standalone View
www/qt5-webengine/files/patch-src_3rdparty_chromium_base_sys__info__freebsd.cc
--- src/3rdparty/chromium/base/sys_info_freebsd.cc.orig 2017-01-26 00:49:07 UTC | --- src/3rdparty/chromium/base/sys_info_freebsd.cc.orig 2018-11-13 18:25:11 UTC | ||||
+++ src/3rdparty/chromium/base/sys_info_freebsd.cc | +++ src/3rdparty/chromium/base/sys_info_freebsd.cc | ||||
@@ -12,12 +12,34 @@ | @@ -13,26 +13,58 @@ | ||||
namespace base { | namespace base { | ||||
+int64_t SysInfo::AmountOfAvailablePhysicalMemory() { | int64_t SysInfo::AmountOfPhysicalMemoryImpl() { | ||||
+ int page_size, r = 0; | |||||
+ unsigned pgfree, pginact, pgcache; | |||||
+ size_t size = sizeof(page_size); | |||||
+ size_t szpg = sizeof(pgfree); | |||||
+ if(r == 0) | |||||
+ r = sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0); | |||||
+ if(r == 0) | |||||
+ r = sysctlbyname("vm.stats.vm.v_free_count", &pgfree, &szpg, NULL, 0); | |||||
+ if(r == 0) | |||||
+ r = sysctlbyname("vm.stats.vm.v_inactive_count", &pginact, &szpg, NULL, 0); | |||||
+ if(r == 0) | |||||
+ r = sysctlbyname("vm.stats.vm.v_cache_count", &pgcache, &szpg, NULL, 0); | |||||
+ if (r == -1) { | |||||
+ NOTREACHED(); | |||||
+ return 0; | |||||
+ } | |||||
+ return static_cast<int64_t>((pgfree + pginact + pgcache) * page_size); | |||||
+} | |||||
+ | |||||
int64_t SysInfo::AmountOfPhysicalMemory() { | |||||
- 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); | ||||
- if (pages == -1 || page_size == -1) { | - if (pages == -1 || page_size == -1) { | ||||
+ if(r == 0) | + if(r == 0) | ||||
+ r = sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0); | + r = sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0); | ||||
+ if(r == 0) | + if(r == 0) | ||||
+ r = sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0); | + r =sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0); | ||||
+ if (r == -1) { | + if(r == -1) { | ||||
NOTREACHED(); | NOTREACHED(); | ||||
return 0; | return 0; | ||||
} | } | ||||
@@ -25,14 +47,24 @@ int64_t SysInfo::AmountOfPhysicalMemory( | return static_cast<int64_t>(pages) * page_size; | ||||
} | } | ||||
// static | -// static | ||||
-uint64_t SysInfo::MaxSharedMemorySize() { | -uint64_t SysInfo::MaxSharedMemorySize() { | ||||
- size_t limit; | - size_t limit; | ||||
- 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) { | ||||
+int64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() { | |||||
+ int page_size, r = 0; | |||||
+ unsigned pgfree, pginact, pgcache; | |||||
+ size_t size = sizeof(page_size); | |||||
+ size_t szpg = sizeof(pgfree); | |||||
+ if(r == 0) | |||||
+ r = sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0); | |||||
+ if(r == 0) | |||||
+ r = sysctlbyname("vm.stats.vm.v_free_count", &pgfree, &szpg, NULL, 0); | |||||
+ if(r == 0) | |||||
+ r = sysctlbyname("vm.stats.vm.v_inactive_count", &pginact, &szpg, NULL, 0); | |||||
+ if(r == 0) | |||||
+ r = sysctlbyname("vm.stats.vm.v_cache_count", &pgcache, &szpg, NULL, 0); | |||||
+ if(r == -1) { | |||||
NOTREACHED(); | |||||
return 0; | |||||
} | |||||
- return static_cast<uint64_t>(limit); | |||||
+ return static_cast<int64_t>((pgfree + pginact + pgcache) * page_size); | |||||
+} | |||||
+ | |||||
+// static | |||||
+std::string SysInfo::CPUModelName() { | +std::string SysInfo::CPUModelName() { | ||||
+ int mib[] = { CTL_HW, HW_MODEL }; | + int mib[] = { CTL_HW, HW_MODEL }; | ||||
+ char name[256]; | + char name[256]; | ||||
+ size_t size = arraysize(name); | + size_t size = arraysize(name); | ||||
+ if (sysctl(mib, arraysize(mib), &name, &size, NULL, 0) == 0) | + if (sysctl(mib, arraysize(mib), &name, &size, NULL, 0) == 0) | ||||
+ return name; | + return name; | ||||
+ return std::string(); | + return std::string(); | ||||
+} | +} | ||||
+ | + | ||||
+int SysInfo::NumberOfProcessors() { | +int SysInfo::NumberOfProcessors() { | ||||
+ int mib[] = { CTL_HW, HW_NCPU }; | + int mib[] = { CTL_HW, HW_NCPU }; | ||||
+ int ncpu; | + int ncpu; | ||||
+ size_t size = sizeof(ncpu); | + size_t size = sizeof(ncpu); | ||||
+ if (sysctl(mib, arraysize(mib), &ncpu, &size, NULL, 0) == -1) { | + if (sysctl(mib, arraysize(mib), &ncpu, &size, NULL, 0) == -1) { | ||||
NOTREACHED(); | + NOTREACHED(); | ||||
- return 0; | |||||
+ return 1; | + return 1; | ||||
} | + } | ||||
- return static_cast<uint64_t>(limit); | |||||
+ return ncpu; | + return ncpu; | ||||
} | } | ||||
} // namespace base | } // namespace base |