Merge pull request #1575 from simonnagl/feature/macOS

Adapt processors and pid_max to macOS

diff --git a/src/Makefile.am b/src/Makefile.am
index d7adc7c2d862cc2f12382cbd119d0c959c614a9e..b5c83883694632b8b555878eee0aa489cfc42813 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,7 +24,9 @@ dist_cache_DATA = .keep
 dist_varlib_DATA = .keep
 dist_registry_DATA = .keep
 dist_log_DATA = .keep
+if !MACOS
 plugins_PROGRAMS = apps.plugin
+endif
 
 netdata_SOURCES = \
        appconfig.c appconfig.h \

diff --git a/src/common.c b/src/common.c
index 28ba72594d47cef1535d0611e2755dbad8ad4d68..f6f2ee1a40c761e0a95a4fdcf0a614d7767ee3a7 100644 (file)
--- a/src/common.c
+++ b/src/common.c
@@ -1101,6 +1101,18 @@ int processors = 1;
 long get_system_cpus(void) {
     processors = 1;
 
+    #ifdef __APPLE__
+        int32_t tmp_processors;
+
+        if (unlikely(GETSYSCTL("hw.logicalcpu", tmp_processors))) {
+            error("Assuming system has %d processors.", processors);
+        } else {
+            processors = tmp_processors;
+        }
+
+        return processors;
+    #else
+
     char filename[FILENAME_MAX + 1];
     snprintfz(filename, FILENAME_MAX, "%s/proc/stat", global_host_prefix);
 
@@ -1130,10 +1142,19 @@ long get_system_cpus(void) {
 
     debug(D_SYSTEM, "System has %d processors.", processors);
     return processors;
+
+    #endif /* __APPLE__ */
 }
 
 pid_t pid_max = 32768;
 pid_t get_system_pid_max(void) {
+    #ifdef __APPLE__
+        // As we currently do not know a solution to query pid_max from the os
+        // we use the number defined in bsd/sys/proc_internal.h in XNU sources
+        pid_max = 99999;
+        return pid_max;
+    #else
+
     char filename[FILENAME_MAX + 1];
     snprintfz(filename, FILENAME_MAX, "%s/proc/sys/kernel/pid_max", global_host_prefix);
     procfile *ff = procfile_open(filename, NULL, PROCFILE_FLAG_DEFAULT);
@@ -1159,6 +1180,8 @@ pid_t get_system_pid_max(void) {
     procfile_close(ff);
     debug(D_SYSTEM, "System supports %d pids.", pid_max);
     return pid_max;
+
+    #endif /* __APPLE__ */
 }
 
 unsigned int hz;

diff --git a/src/macos_sysctl.c b/src/macos_sysctl.c
index 3a8498efa96a3d7a65b25a4ee43e8a485aaf2f47..955b70757eb02c87ddb4ecaa7be9ad1abdbd8681 100644 (file)
--- a/src/macos_sysctl.c
+++ b/src/macos_sysctl.c
@@ -20,13 +20,9 @@
 // NEEDED BY do_uptime
 #include <time.h>
 
-#define GETSYSCTL(name, var) getsysctl(name, &(var), sizeof(var))
-
 // MacOS calculates load averages once every 5 seconds
 #define MIN_LOADAVG_UPDATE_EVERY 5
 
-int getsysctl(const char *name, void *ptr, size_t len);
-
 int do_macos_sysctl(int update_every, usec_t dt) {
     (void)dt;
 

diff --git a/src/plugin_macos.h b/src/plugin_macos.h
index a6f966a87e0e7271b526ffd44bfffbc6618a83f6..a21e5601de13faed21661b7ca51d76f2283640ba 100644 (file)
--- a/src/plugin_macos.h
+++ b/src/plugin_macos.h
@@ -3,6 +3,10 @@
 
 void *macos_main(void *ptr);
 
+#define GETSYSCTL(name, var) getsysctl(name, &(var), sizeof(var))
+
+extern int getsysctl(const char *name, void *ptr, size_t len);
+
 extern int do_macos_sysctl(int update_every, usec_t dt);
 extern int do_macos_mach_smi(int update_every, usec_t dt);
 extern int do_macos_iokit(int update_every, usec_t dt);