From dadcb87ad0a72555c4797a0eeaafb3236bf50295 Mon Sep 17 00:00:00 2001 From: Alexander Momchilov Date: Sun, 22 Aug 2021 12:30:08 -0400 Subject: Extract Darwin "PlatformHelpers" --- Makefile.am | 2 ++ darwin/DarwinProcess.h | 1 + darwin/DarwinProcessList.c | 44 ++--------------------------- darwin/Platform.c | 12 ++------ darwin/PlatformHelpers.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++ darwin/PlatformHelpers.h | 29 +++++++++++++++++++ 6 files changed, 107 insertions(+), 51 deletions(-) create mode 100644 darwin/PlatformHelpers.c create mode 100644 darwin/PlatformHelpers.h diff --git a/Makefile.am b/Makefile.am index 4d40fdbc..7ed500ca 100644 --- a/Makefile.am +++ b/Makefile.am @@ -307,6 +307,7 @@ darwin_platform_headers = \ darwin/DarwinProcess.h \ darwin/DarwinProcessList.h \ darwin/Platform.h \ + darwin/PlatformHelpers.h \ darwin/ProcessField.h \ generic/gettime.h \ generic/hostname.h \ @@ -318,6 +319,7 @@ darwin_platform_headers = \ darwin_platform_sources = \ darwin/Platform.c \ + darwin/PlatformHelpers.c \ darwin/DarwinProcess.c \ darwin/DarwinProcessList.c \ generic/gettime.c \ diff --git a/darwin/DarwinProcess.h b/darwin/DarwinProcess.h index 5ff75fc2..b4b86fdb 100644 --- a/darwin/DarwinProcess.h +++ b/darwin/DarwinProcess.h @@ -12,6 +12,7 @@ in the source distribution for its full text. #include "Settings.h" #include "darwin/DarwinProcessList.h" + typedef struct DarwinProcess_ { Process super; 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); diff --git a/darwin/Platform.c b/darwin/Platform.c index 4df11b2d..3f596a39 100644 --- a/darwin/Platform.c +++ b/darwin/Platform.c @@ -35,6 +35,7 @@ in the source distribution for its full text. #include "TasksMeter.h" #include "UptimeMeter.h" #include "darwin/DarwinProcessList.h" +#include "darwin/PlatformHelpers.h" #include "zfs/ZfsArcMeter.h" #include "zfs/ZfsCompressedArcMeter.h" @@ -42,6 +43,7 @@ in the source distribution for its full text. #include #include #endif + #ifdef HAVE_MACH_MACH_TIME_H #include #endif @@ -125,15 +127,7 @@ static double Platform_nanosecondsPerMachTick = 1.0; static double Platform_nanosecondsPerSchedulerTick = -1; void Platform_init(void) { - // Check if we can determine the timebase used on this system. - // If the API is unavailable assume we get our timebase in nanoseconds. -#ifdef HAVE_MACH_TIMEBASE_INFO - mach_timebase_info_data_t info; - mach_timebase_info(&info); - Platform_nanosecondsPerMachTick = (double)info.numer / (double)info.denom; -#else - Platform_nanosecondsPerMachTick = 1.0; -#endif + Platform_nanosecondsPerMachTick = Platform_calculateNanosecondsPerMachTick(); // Determine the number of scheduler clock ticks per second errno = 0; diff --git a/darwin/PlatformHelpers.c b/darwin/PlatformHelpers.c new file mode 100644 index 00000000..9d4fe120 --- /dev/null +++ b/darwin/PlatformHelpers.c @@ -0,0 +1,70 @@ +/* +htop - darwin/PlatformHelpers.c +(C) 2018 Pierre Malhaire, 2020-2021 htop dev team, 2021 Alexander Momchilov +Released under the GNU GPLv2+, see the COPYING file +in the source distribution for its full text. +*/ + +#include "darwin/PlatformHelpers.h" + +#include +#include +#include +#include +#include + +#include "CRT.h" + +#ifdef HAVE_MACH_MACH_TIME_H +#include +#endif + + +void Platform_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 Platform_CompareKernelVersion(short int major, short int minor, short int component) { + struct kern k; + Platform_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; +} + +double Platform_calculateNanosecondsPerMachTick() { + // Check if we can determine the timebase used on this system. + // If the API is unavailable assume we get our timebase in nanoseconds. +#ifdef HAVE_MACH_TIMEBASE_INFO + mach_timebase_info_data_t info; + mach_timebase_info(&info); + return (double)info.numer / (double)info.denom; +#else + return 1.0; +#endif +} diff --git a/darwin/PlatformHelpers.h b/darwin/PlatformHelpers.h new file mode 100644 index 00000000..25c5dcc0 --- /dev/null +++ b/darwin/PlatformHelpers.h @@ -0,0 +1,29 @@ +#ifndef HEADER_PlatformHelpers +#define HEADER_PlatformHelpers +/* +htop - darwin/PlatformHelpers.h +(C) 2018 Pierre Malhaire, 2020-2021 htop dev team, 2021 Alexander Momchilov +Released under the GNU GPLv2, see the COPYING file +in the source distribution for its full text. +*/ + +#include +#include + + +struct kern { + short int version[3]; +}; + +void Platform_GetKernelVersion(struct kern* k); + +/* 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 Platform_CompareKernelVersion(short int major, short int minor, short int component); + +double Platform_calculateNanosecondsPerMachTick(void); + +#endif -- cgit v1.2.3