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
103
104
105
106
107
|
$NetBSD: patch-xbmc_utils_CPUInfo.cpp,v 1.4 2015/11/18 23:27:23 jmcneill Exp $
--- xbmc/utils/CPUInfo.cpp.orig 2015-10-19 06:31:15.000000000 +0000
+++ xbmc/utils/CPUInfo.cpp
@@ -36,7 +36,7 @@
#endif
#endif
-#if defined(TARGET_FREEBSD)
+#if defined(TARGET_FREEBSD) || defined(TARGET_NETBSD)
#include <sys/types.h>
#include <sys/sysctl.h>
#include <sys/resource.h>
@@ -234,7 +234,7 @@ CCPUInfo::CCPUInfo(void)
}
else
m_cpuQueryLoad = NULL;
-#elif defined(TARGET_FREEBSD)
+#elif defined(TARGET_FREEBSD) || defined(TARGET_NETBSD)
size_t len;
int i;
char cpumodel[512];
@@ -538,6 +538,12 @@ float CCPUInfo::getCPUFrequency()
if (sysctlbyname("dev.cpu.0.freq", &hz, &len, NULL, 0) != 0)
hz = 0;
return (float)hz;
+#elif defined(TARGET_NETBSD)
+ int hz = 0;
+ size_t len = sizeof(hz);
+ if (sysctlbyname("machdep.cpu.frequency.current", &hz, &len, NULL, 0) != 0)
+ hz = 0;
+ return (float)hz;
#else
int value = 0;
if (m_fCPUFreq && !m_cpuInfoForFreq)
@@ -699,7 +705,8 @@ bool CCPUInfo::readProcStat(unsigned lon
else
for (std::map<int, CoreInfo>::iterator it = m_cores.begin(); it != m_cores.end(); ++it)
it->second.m_fPct = double(m_lastUsedPercentage); // use CPU average as fallback
-#elif defined(TARGET_FREEBSD)
+#elif defined(TARGET_FREEBSD) || defined(TARGET_NETBSD)
+#if defined(TARGET_FREEBSD)
long *cptimes;
size_t len;
int i;
@@ -715,6 +722,19 @@ bool CCPUInfo::readProcStat(unsigned lon
free(cptimes);
return false;
}
+#elif defined(TARGET_NETBSD)
+ uint64_t *cptimes;
+ size_t len;
+ int i;
+
+ len = sizeof(*cptimes) * m_cpuCount * CPUSTATES;
+ cptimes = (uint64_t*)malloc(len);
+ if (sysctlbyname("kern.cp_time", cptimes, &len, NULL, 0) != 0)
+ {
+ free(cptimes);
+ return false;
+ }
+#endif
user = 0;
nice = 0;
system = 0;
@@ -722,7 +742,11 @@ bool CCPUInfo::readProcStat(unsigned lon
io = 0;
for (i = 0; i < m_cpuCount; i++)
{
+#if defined(TARGET_NETBSD)
+ int64_t coreUser, coreNice, coreSystem, coreIdle, coreIO;
+#else
long coreUser, coreNice, coreSystem, coreIdle, coreIO;
+#endif
double total;
coreUser = cptimes[i * CPUSTATES + CP_USER];
@@ -741,7 +765,9 @@ bool CCPUInfo::readProcStat(unsigned lon
coreIO -= iter->second.m_io;
total = (double)(coreUser + coreNice + coreSystem + coreIdle + coreIO);
- if(total != 0.0f)
+ if(total == 0.0f)
+ iter->second.m_fPct = 0.0f;
+ else
iter->second.m_fPct = ((double)(coreUser + coreNice + coreSystem) * 100.0) / total;
iter->second.m_user += coreUser;
@@ -931,6 +957,18 @@ bool CCPUInfo::HasNeon()
#elif defined(TARGET_DARWIN_IOS)
has_neon = 1;
+#elif defined(TARGET_NETBSD) && defined(__ARM_NEON__)
+ if (has_neon == -1)
+ {
+ has_neon = 0;
+ int flag;
+ size_t len = sizeof(flag);
+ if (sysctlbyname("machdep.neon_present", &flag, &len, NULL, 0) == 0)
+ {
+ has_neon = 1;
+ }
+ }
+
#elif defined(TARGET_LINUX) && defined(__ARM_NEON__)
if (has_neon == -1)
{
|
