diff options
Diffstat (limited to 'devel/electron4/files/patch-base_sys__info__freebsd.cc')
-rw-r--r-- | devel/electron4/files/patch-base_sys__info__freebsd.cc | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/devel/electron4/files/patch-base_sys__info__freebsd.cc b/devel/electron4/files/patch-base_sys__info__freebsd.cc new file mode 100644 index 000000000000..0817663ccff2 --- /dev/null +++ b/devel/electron4/files/patch-base_sys__info__freebsd.cc @@ -0,0 +1,71 @@ +--- base/sys_info_freebsd.cc.orig 2019-03-15 06:36:56 UTC ++++ base/sys_info_freebsd.cc +@@ -13,26 +13,58 @@ + namespace base { + + int64_t SysInfo::AmountOfPhysicalMemoryImpl() { +- int pages, page_size; ++ int pages, page_size, r = 0; + size_t size = sizeof(pages); +- sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0); +- sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0); +- if (pages == -1 || page_size == -1) { ++ if(r == 0) ++ r = sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0); ++ if(r == 0) ++ r =sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0); ++ if(r == -1) { + NOTREACHED(); + return 0; + } + return static_cast<int64_t>(pages) * page_size; + } + +-// static +-uint64_t SysInfo::MaxSharedMemorySize() { +- size_t limit; +- size_t size = sizeof(limit); +- 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() { ++ int mib[] = { CTL_HW, HW_MODEL }; ++ char name[256]; ++ size_t size = arraysize(name); ++ if (sysctl(mib, arraysize(mib), &name, &size, NULL, 0) == 0) ++ return name; ++ return std::string(); ++} ++ ++int SysInfo::NumberOfProcessors() { ++ int mib[] = { CTL_HW, HW_NCPU }; ++ int ncpu; ++ size_t size = sizeof(ncpu); ++ if (sysctl(mib, arraysize(mib), &ncpu, &size, NULL, 0) == -1) { ++ NOTREACHED(); ++ return 1; ++ } ++ return ncpu; + } + + } // namespace base |