diff options
author | Alexander Momchilov <alexandermomchilov@gmail.com> | 2021-08-22 12:30:08 -0400 |
---|---|---|
committer | Alexander Momchilov <alexandermomchilov@gmail.com> | 2021-09-26 10:58:47 -0400 |
commit | dadcb87ad0a72555c4797a0eeaafb3236bf50295 (patch) | |
tree | f1b506454732bc5aecc681d9558a5c91ba99e382 /darwin/DarwinProcessList.c | |
parent | 754c0d6bb98e8dbe412ad149717e26e07c57c5e7 (diff) |
Extract Darwin "PlatformHelpers"
Diffstat (limited to 'darwin/DarwinProcessList.c')
-rw-r--r-- | darwin/DarwinProcessList.c | 44 |
1 files changed, 2 insertions, 42 deletions
diff --git a/darwin/DarwinProcessList.c b/darwin/DarwinProcessList.c index a7db0e43..1e865f59 100644 --- a/darwin/DarwinProcessList.c +++ b/darwin/DarwinProcessList.c @@ -22,51 +22,11 @@ in the source distribution for its full text. #include "ProcessList.h" #include "darwin/DarwinProcess.h" #include "darwin/Platform.h" +#include "darwin/PlatformHelpers.h" #include "generic/openzfs_sysctl.h" #include "zfs/ZfsArcStats.h" -struct kern { - short int version[3]; -}; - -static 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 -*/ -static 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; -} - static void ProcessList_getHostInfo(host_basic_info_data_t* p) { mach_msg_type_number_t info_size = HOST_BASIC_INFO_COUNT; @@ -216,7 +176,7 @@ void ProcessList_goThroughEntries(ProcessList* super, bool pauseProcessUpdate) { } // Disabled for High Sierra due to bug in macOS High Sierra - bool isScanThreadSupported = ! ( CompareKernelVersion(17, 0, 0) >= 0 && CompareKernelVersion(17, 5, 0) < 0); + bool isScanThreadSupported = !(Platform_CompareKernelVersion(17, 0, 0) >= 0 && Platform_CompareKernelVersion(17, 5, 0) < 0); if (isScanThreadSupported) { DarwinProcess_scanThreads(proc); |