1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
|
--- base/system/sys_info_openbsd.cc.orig 2022-03-25 21:59:56 UTC
+++ base/system/sys_info_openbsd.cc
@@ -12,6 +12,7 @@
#include "base/cxx17_backports.h"
#include "base/notreached.h"
+#include "base/strings/string_util.h"
namespace {
@@ -29,9 +30,15 @@ int64_t AmountOfMemory(int pages_name) {
namespace base {
+// pledge(2)
+int64_t aofpmem = 0;
+int64_t aofapmem = 0;
+int64_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, base::size(mib), &ncpu, &size, NULL, 0) < 0) {
@@ -43,38 +50,62 @@ int SysInfo::NumberOfProcessors() {
// static
int64_t SysInfo::AmountOfPhysicalMemoryImpl() {
- return AmountOfMemory(_SC_PHYS_PAGES);
+ // pledge(2)
+ if (!aofpmem)
+ aofpmem = AmountOfMemory(_SC_PHYS_PAGES);
+ return aofpmem;
}
// static
int64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() {
// We should add inactive file-backed memory also but there is no such
// information from OpenBSD unfortunately.
- return AmountOfMemory(_SC_AVPHYS_PAGES);
+ // pledge(2)
+ if (!aofapmem)
+ aofapmem = AmountOfMemory(_SC_AVPHYS_PAGES);
+ return aofapmem;
}
// static
+std::string SysInfo::CPUModelName() {
+ int mib[] = {CTL_HW, HW_MODEL};
+ size_t len = base::size(cpumodel);
+
+ if (cpumodel[0] == '\0') {
+ if (sysctl(mib, base::size(mib), cpumodel, &len, NULL, 0) < 0)
+ return std::string();
+ }
+
+ return std::string(cpumodel, len - 1);
+}
+
+// static
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, base::size(mib), &limit, &size, NULL, 0) < 0) {
NOTREACHED();
return 0;
}
- return static_cast<uint64_t>(limit);
+ shmmax = static_cast<uint64_t>(limit);
+out:
+ return shmmax;
}
// static
-std::string SysInfo::CPUModelName() {
- int mib[] = {CTL_HW, HW_MODEL};
- char name[256];
- size_t len = base::size(name);
- if (sysctl(mib, base::size(mib), name, &len, NULL, 0) < 0) {
- NOTREACHED();
- return std::string();
- }
- return name;
+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
|
