From 55411f11782b5263d71e41ea041eafe2b841e4c6 Mon Sep 17 00:00:00 2001 From: Stuart Caie Date: Mon, 25 Jul 2022 12:19:31 +0000 Subject: [PATCH 1/2] Replace IOMainPort/IOMasterPort() and kIOMainPortDefault/kIOMasterPortDefault with NULL --- disk/iostat_darwin.c | 4 +--- disk/iostat_darwin.h | 4 ---- host/smc_darwin.c | 2 +- host/smc_darwin.h | 5 ----- 4 files changed, 2 insertions(+), 13 deletions(-) diff --git a/disk/iostat_darwin.c b/disk/iostat_darwin.c index 5667bf96a..dbdd750f7 100644 --- a/disk/iostat_darwin.c +++ b/disk/iostat_darwin.c @@ -18,17 +18,15 @@ static int fillstat(io_registry_entry_t d, DriveStats *stat); int gopsutil_v3_readdrivestat(DriveStats a[], int n) { - mach_port_t port; CFMutableDictionaryRef match; io_iterator_t drives; io_registry_entry_t d; kern_return_t status; int na, rv; - IOMainPort(bootstrap_port, &port); match = IOServiceMatching("IOMedia"); CFDictionaryAddValue(match, CFSTR(kIOMediaWholeKey), kCFBooleanTrue); - status = IOServiceGetMatchingServices(port, match, &drives); + status = IOServiceGetMatchingServices((mach_port_t) NULL, match, &drives); if(status != KERN_SUCCESS) return -1; diff --git a/disk/iostat_darwin.h b/disk/iostat_darwin.h index d004ac987..cb9ec7a0a 100644 --- a/disk/iostat_darwin.h +++ b/disk/iostat_darwin.h @@ -30,7 +30,3 @@ struct CPUStats { }; extern int gopsutil_v3_readdrivestat(DriveStats a[], int n); - -#if (MAC_OS_X_VERSION_MIN_REQUIRED < 120000) // Before macOS 12 Monterey - #define IOMainPort IOMasterPort -#endif diff --git a/host/smc_darwin.c b/host/smc_darwin.c index fa54b1d03..cd50ecb08 100644 --- a/host/smc_darwin.c +++ b/host/smc_darwin.c @@ -72,7 +72,7 @@ kern_return_t gopsutil_v3_open_smc(void) { kern_return_t result; io_service_t service; - service = IOServiceGetMatchingService(kIOMainPortDefault, + service = IOServiceGetMatchingService((mach_port_t) NULL, IOServiceMatching(IOSERVICE_SMC)); if (service == 0) { // Note: IOServiceMatching documents 0 on failure diff --git a/host/smc_darwin.h b/host/smc_darwin.h index 8d5ba68a4..e3013abdb 100644 --- a/host/smc_darwin.h +++ b/host/smc_darwin.h @@ -29,9 +29,4 @@ kern_return_t gopsutil_v3_open_smc(void); kern_return_t gopsutil_v3_close_smc(void); double gopsutil_v3_get_temperature(char *); -#if (MAC_OS_X_VERSION_MIN_REQUIRED < 120000) // Before macOS 12 Monterey - #define kIOMainPortDefault kIOMasterPortDefault -#endif - - #endif // __SMC_H__ From e0400cc94f3c64684b2a3a7a8905c355fdc2238b Mon Sep 17 00:00:00 2001 From: Stuart Caie Date: Sat, 30 Jul 2022 00:44:15 +0000 Subject: [PATCH 2/2] Use 0 as default mach port --- disk/iostat_darwin.c | 2 +- host/smc_darwin.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/disk/iostat_darwin.c b/disk/iostat_darwin.c index dbdd750f7..8aab04f60 100644 --- a/disk/iostat_darwin.c +++ b/disk/iostat_darwin.c @@ -26,7 +26,7 @@ gopsutil_v3_readdrivestat(DriveStats a[], int n) match = IOServiceMatching("IOMedia"); CFDictionaryAddValue(match, CFSTR(kIOMediaWholeKey), kCFBooleanTrue); - status = IOServiceGetMatchingServices((mach_port_t) NULL, match, &drives); + status = IOServiceGetMatchingServices(0, match, &drives); if(status != KERN_SUCCESS) return -1; diff --git a/host/smc_darwin.c b/host/smc_darwin.c index cd50ecb08..0197d95b4 100644 --- a/host/smc_darwin.c +++ b/host/smc_darwin.c @@ -72,8 +72,7 @@ kern_return_t gopsutil_v3_open_smc(void) { kern_return_t result; io_service_t service; - service = IOServiceGetMatchingService((mach_port_t) NULL, - IOServiceMatching(IOSERVICE_SMC)); + service = IOServiceGetMatchingService(0, IOServiceMatching(IOSERVICE_SMC)); if (service == 0) { // Note: IOServiceMatching documents 0 on failure printf("ERROR: %s NOT FOUND\n", IOSERVICE_SMC);