From 5e9c38bb718c68080bd104d49197470d12ebc6b1 Mon Sep 17 00:00:00 2001 From: Pierrot Date: Wed, 7 Feb 2018 00:33:57 +0100 Subject: [PATCH 1/2] keep scan thread for version before high sierra 13.0.0 and after 13.3.0 --- darwin/DarwinProcessList.c | 57 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 54 insertions(+), 3 deletions(-) diff --git a/darwin/DarwinProcessList.c b/darwin/DarwinProcessList.c index 9aad8b4a2..de8d0b96e 100644 --- a/darwin/DarwinProcessList.c +++ b/darwin/DarwinProcessList.c @@ -18,6 +18,53 @@ in the source distribution for its full text. #include #include #include +#include +#include + +void GetKernelVersion(int * major, int * minor, int * internal) { + static int cMajor = 0; + static int cMinor = 0; + static int cInternal = 0; + if (!cMajor) { + // just in case it fails someday + cMajor = cMinor = cInternal = -1; + char str[256] = {0}; + size_t size = sizeof(str); + int ret = sysctlbyname("kern.osrelease", str, &size, NULL, 0); + if (ret == 0) { + sscanf(str, "%d.%d.%d", &cMajor, &cMinor, &cInternal); + } + } + *major = cMajor; + *minor = cMinor; + *internal = cInternal; +} + +bool IsKernelVersionUpperOrEqual(int major, int minor, int internal) { + int maj, min, inter; + + GetKernelVersion(&maj, &min, &inter); + + if ( maj > major) return true; + if ( maj == major) { + if ( min > minor ) return true; + else if ( min == minor && inter >= internal ) return true; + } + return false; +} + +bool IsKernelVersionLessOrEqual(int major, int minor, int internal) { + int maj, min, inter; + + GetKernelVersion(&maj, &min, &inter); + + if ( maj < major) return true; + if ( maj == major) { + if ( min < minor ) return true; + else if ( min == minor && inter <= internal ) return true; + } + return false; +} /*{ #include "ProcessList.h" @@ -170,9 +217,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 = ! ( IsKernelVersionUpperOrEqual(17, 0, 0) && IsKernelVersionLessOrEqual(17, 4, 0)); + + if (isScanThreadSupported){ + DarwinProcess_scanThreads(proc); + } super->totalTasks += 1; From 08dbac0e62262d65ae124861cd3cb4f6fe8402c5 Mon Sep 17 00:00:00 2001 From: Pierrot Date: Sat, 17 Feb 2018 23:28:38 +0100 Subject: [PATCH 2/2] compact version test code for osx --- darwin/DarwinProcessList.c | 55 +++++++++++++------------------------- 1 file changed, 18 insertions(+), 37 deletions(-) diff --git a/darwin/DarwinProcessList.c b/darwin/DarwinProcessList.c index de8d0b96e..b4e263477 100644 --- a/darwin/DarwinProcessList.c +++ b/darwin/DarwinProcessList.c @@ -21,49 +21,30 @@ in the source distribution for its full text. #include #include -void GetKernelVersion(int * major, int * minor, int * internal) { - static int cMajor = 0; - static int cMinor = 0; - static int cInternal = 0; - if (!cMajor) { +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 - cMajor = cMinor = cInternal = -1; + 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, "%d.%d.%d", &cMajor, &cMinor, &cInternal); - } + if (ret == 0) sscanf(str, "%hd.%hd.%hd", &version_[0], &version_[1], &version_[2]); } - *major = cMajor; - *minor = cMinor; - *internal = cInternal; + memcpy(k->version, version_, sizeof(version_)); } -bool IsKernelVersionUpperOrEqual(int major, int minor, int internal) { - int maj, min, inter; - - GetKernelVersion(&maj, &min, &inter); - - if ( maj > major) return true; - if ( maj == major) { - if ( min > minor ) return true; - else if ( min == minor && inter >= internal ) return true; - } - return false; -} - -bool IsKernelVersionLessOrEqual(int major, int minor, int internal) { - int maj, min, inter; - - GetKernelVersion(&maj, &min, &inter); - - if ( maj < major) return true; - if ( maj == major) { - if ( min < minor ) return true; - else if ( min == minor && inter <= internal ) return true; - } - return false; +int CompareKernelVersion(short int major, short int minor, short int component) { + struct kern k; + GetKernelVersion(&k); + if ( k.version[0] != major) return major - k.version[0]; + if ( k.version[1] != minor) return minor - k.version[1]; + if ( k.version[2] != component) return component - k.version[2]; + return 0; } /*{ @@ -219,7 +200,7 @@ void ProcessList_goThroughEntries(ProcessList* super) { DarwinProcess_setFromLibprocPidinfo(proc, dpl); // Disabled for High Sierra due to bug in macOS High Sierra - bool isScanThreadSupported = ! ( IsKernelVersionUpperOrEqual(17, 0, 0) && IsKernelVersionLessOrEqual(17, 4, 0)); + bool isScanThreadSupported = ! ( CompareKernelVersion(17, 0, 0) >= 0 && CompareKernelVersion(17, 5, 0) < 0); if (isScanThreadSupported){ DarwinProcess_scanThreads(proc);