aboutsummaryrefslogtreecommitdiffstats
path: root/darwin/DarwinProcessList.c
diff options
context:
space:
mode:
Diffstat (limited to 'darwin/DarwinProcessList.c')
-rw-r--r--darwin/DarwinProcessList.c43
1 files changed, 40 insertions, 3 deletions
diff --git a/darwin/DarwinProcessList.c b/darwin/DarwinProcessList.c
index 9aad8b4..4a580ac 100644
--- a/darwin/DarwinProcessList.c
+++ b/darwin/DarwinProcessList.c
@@ -18,6 +18,39 @@ in the source distribution for its full text.
#include <sys/mman.h>
#include <utmpx.h>
#include <err.h>
+#include <sys/sysctl.h>
+#include <stdbool.h>
+
+struct kern {
+ short int version[3];
+};
+
+void GetKernelVersion(struct kern *k) {
+ static short int version_[3] = {0};
+ if (!version_[0]) {
+ // just in case it fails someday
+ version_[0] = version_[1] = version_[2] = -1;
+ char str[256] = {0};
+ size_t size = sizeof(str);
+ int ret = sysctlbyname("kern.osrelease", str, &size, NULL, 0);
+ if (ret == 0) sscanf(str, "%hd.%hd.%hd", &version_[0], &version_[1], &version_[2]);
+ }
+ memcpy(k->version, version_, sizeof(version_));
+}
+
+/* compare the given os version with the one installed returns:
+0 if equals the installed version
+positive value if less than the installed version
+negative value if more than the installed version
+*/
+int CompareKernelVersion(short int major, short int minor, short int component) {
+ struct kern k;
+ GetKernelVersion(&k);
+ if ( k.version[0] != major) return k.version[0] - major;
+ if ( k.version[1] != minor) return k.version[1] - minor;
+ if ( k.version[2] != component) return k.version[2] - component;
+ return 0;
+}
/*{
#include "ProcessList.h"
@@ -170,9 +203,13 @@ void ProcessList_goThroughEntries(ProcessList* super) {
DarwinProcess_setFromKInfoProc(&proc->super, &ps[i], tv.tv_sec, preExisting);
DarwinProcess_setFromLibprocPidinfo(proc, dpl);
-
- // Disabled due to bug in macOS High Sierra
- // DarwinProcess_scanThreads(proc);
+
+ // Disabled for High Sierra due to bug in macOS High Sierra
+ bool isScanThreadSupported = ! ( CompareKernelVersion(17, 0, 0) >= 0 && CompareKernelVersion(17, 5, 0) < 0);
+
+ if (isScanThreadSupported){
+ DarwinProcess_scanThreads(proc);
+ }
super->totalTasks += 1;

© 2014-2024 Faster IT GmbH | imprint | privacy policy