diff options
Diffstat (limited to 'devel/electron33/files/patch-base_system_sys__info__openbsd.cc')
-rw-r--r-- | devel/electron33/files/patch-base_system_sys__info__openbsd.cc | 85 |
1 files changed, 0 insertions, 85 deletions
diff --git a/devel/electron33/files/patch-base_system_sys__info__openbsd.cc b/devel/electron33/files/patch-base_system_sys__info__openbsd.cc deleted file mode 100644 index 423f6837faa5..000000000000 --- a/devel/electron33/files/patch-base_system_sys__info__openbsd.cc +++ /dev/null @@ -1,85 +0,0 @@ ---- base/system/sys_info_openbsd.cc.orig 2024-10-16 21:30:44 UTC -+++ base/system/sys_info_openbsd.cc -@@ -12,6 +12,7 @@ - - #include "base/notreached.h" - #include "base/posix/sysctl.h" -+#include "base/strings/string_util.h" - - namespace { - -@@ -27,9 +28,14 @@ namespace base { - - namespace base { - -+// pledge(2) -+uint64_t aofpmem = 0; -+uint64_t shmmax = 0; -+char cpumodel[256]; -+ - // static - int SysInfo::NumberOfProcessors() { -- int mib[] = {CTL_HW, HW_NCPU}; -+ int mib[] = {CTL_HW, HW_NCPUONLINE}; - int ncpu; - size_t size = sizeof(ncpu); - if (sysctl(mib, std::size(mib), &ncpu, &size, NULL, 0) < 0) { -@@ -40,10 +46,26 @@ uint64_t SysInfo::AmountOfPhysicalMemoryImpl() { - - // static - uint64_t SysInfo::AmountOfPhysicalMemoryImpl() { -- return AmountOfMemory(_SC_PHYS_PAGES); -+ // pledge(2) -+ if (!aofpmem) -+ aofpmem = AmountOfMemory(_SC_PHYS_PAGES); -+ return aofpmem; - } - - // static -+std::string SysInfo::CPUModelName() { -+ int mib[] = {CTL_HW, HW_MODEL}; -+ size_t len = std::size(cpumodel); -+ -+ if (cpumodel[0] == '\0') { -+ if (sysctl(mib, std::size(mib), cpumodel, &len, NULL, 0) < 0) -+ return std::string(); -+ } -+ -+ return std::string(cpumodel, len - 1); -+} -+ -+// static - uint64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() { - // We should add inactive file-backed memory also but there is no such - // information from OpenBSD unfortunately. -@@ -55,15 +77,27 @@ uint64_t SysInfo::MaxSharedMemorySize() { - int mib[] = {CTL_KERN, KERN_SHMINFO, KERN_SHMINFO_SHMMAX}; - size_t limit; - size_t size = sizeof(limit); -+ // pledge(2) -+ if (shmmax) -+ goto out; - if (sysctl(mib, std::size(mib), &limit, &size, NULL, 0) < 0) { - NOTREACHED(); - } -- return static_cast<uint64_t>(limit); -+ shmmax = static_cast<uint64_t>(limit); -+out: -+ return shmmax; - } - - // static --std::string SysInfo::CPUModelName() { -- return StringSysctl({CTL_HW, HW_MODEL}).value(); -+SysInfo::HardwareInfo SysInfo::GetHardwareInfoSync() { -+ HardwareInfo info; -+ // Set the manufacturer to "OpenBSD" and the model to -+ // an empty string. -+ info.manufacturer = "OpenBSD"; -+ info.model = HardwareModelName(); -+ DCHECK(IsStringUTF8(info.manufacturer)); -+ DCHECK(IsStringUTF8(info.model)); -+ return info; - } - - } // namespace base |