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
|
--- third_party/webrtc/base/systeminfo.cc.orig 2017-01-26 00:50:17 UTC
+++ third_party/webrtc/base/systeminfo.cc
@@ -20,8 +20,12 @@
#elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
#include <ApplicationServices/ApplicationServices.h>
#include <CoreServices/CoreServices.h>
-#elif defined(WEBRTC_LINUX)
+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
#include <unistd.h>
+#if defined(WEBRTC_BSD)
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#endif
#endif
#if defined(WEBRTC_MAC)
#include <sys/sysctl.h>
@@ -66,7 +70,7 @@ static int DetectNumberOfCores() {
SYSTEM_INFO si;
GetSystemInfo(&si);
number_of_cores = static_cast<int>(si.dwNumberOfProcessors);
-#elif defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID)
+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID) || defined(WEBRTC_BSD)
number_of_cores = static_cast<int>(sysconf(_SC_NPROCESSORS_ONLN));
#elif defined(WEBRTC_MAC)
int name[] = {CTL_HW, HW_AVAILCPU};
@@ -174,9 +178,13 @@ int64_t SystemInfo::GetMemorySize() {
LOG_GLE(LS_WARNING) << "GlobalMemoryStatusEx failed.";
}
-#elif defined(WEBRTC_MAC)
+#elif defined(WEBRTC_MAC) || defined(WEBRTC_BSD)
size_t len = sizeof(memory);
+ #if defined(WEBRTC_MAC)
int error = sysctlbyname("hw.memsize", &memory, &len, NULL, 0);
+ #else
+ int error = sysctlbyname("hw.physmem", &memory, &len, NULL, 0);
+ #endif
if (error || memory == 0)
memory = -1;
#elif defined(WEBRTC_LINUX)
|
