From c34d29a8bfcfd46bfc270ef26d37118f9f726df6 Mon Sep 17 00:00:00 2001 From: shirou Date: Tue, 28 May 2024 22:42:36 +0900 Subject: [PATCH] fix: rename v3 that remained in file c to v4 --- disk/disk_darwin_cgo.go | 2 +- disk/iostat_darwin.c | 2 +- disk/iostat_darwin.h | 2 +- host/host_aix.go | 2 +- sensors/sensors_darwin_cgo.go | 6 +++--- sensors/smc_darwin.c | 6 +++--- sensors/smc_darwin.h | 6 +++--- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/disk/disk_darwin_cgo.go b/disk/disk_darwin_cgo.go index c5fcc06d7..3a98b61e5 100644 --- a/disk/disk_darwin_cgo.go +++ b/disk/disk_darwin_cgo.go @@ -19,7 +19,7 @@ import ( func IOCountersWithContext(ctx context.Context, names ...string) (map[string]IOCountersStat, error) { var buf [C.NDRIVE]C.DriveStats - n, err := C.gopsutil_v3_readdrivestat(&buf[0], C.int(len(buf))) + n, err := C.gopsutil_v4_readdrivestat(&buf[0], C.int(len(buf))) if err != nil { return nil, err } diff --git a/disk/iostat_darwin.c b/disk/iostat_darwin.c index 2fa33dd1e..ba1e4c505 100644 --- a/disk/iostat_darwin.c +++ b/disk/iostat_darwin.c @@ -18,7 +18,7 @@ static int getdrivestat(io_registry_entry_t d, DriveStats *stat); static int fillstat(io_registry_entry_t d, DriveStats *stat); int -gopsutil_v3_readdrivestat(DriveStats a[], int n) +gopsutil_v4_readdrivestat(DriveStats a[], int n) { CFMutableDictionaryRef match; io_iterator_t drives; diff --git a/disk/iostat_darwin.h b/disk/iostat_darwin.h index 65e26fae2..7b702aaa0 100644 --- a/disk/iostat_darwin.h +++ b/disk/iostat_darwin.h @@ -31,4 +31,4 @@ struct CPUStats { natural_t idle; }; -extern int gopsutil_v3_readdrivestat(DriveStats a[], int n); +extern int gopsutil_v4_readdrivestat(DriveStats a[], int n); diff --git a/host/host_aix.go b/host/host_aix.go index d06899ea0..b47aa5134 100644 --- a/host/host_aix.go +++ b/host/host_aix.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "github.com/shirou/gopsutil/v3/internal/common" + "github.com/shirou/gopsutil/v4/internal/common" ) // from https://www.ibm.com/docs/en/aix/7.2?topic=files-utmph-file diff --git a/sensors/sensors_darwin_cgo.go b/sensors/sensors_darwin_cgo.go index 6ac656b88..407fc76c3 100644 --- a/sensors/sensors_darwin_cgo.go +++ b/sensors/sensors_darwin_cgo.go @@ -34,13 +34,13 @@ func TemperaturesWithContext(ctx context.Context) ([]TemperatureStat, error) { } var temperatures []TemperatureStat - C.gopsutil_v3_open_smc() - defer C.gopsutil_v3_close_smc() + C.gopsutil_v4_open_smc() + defer C.gopsutil_v4_close_smc() for _, key := range temperatureKeys { temperatures = append(temperatures, TemperatureStat{ SensorKey: key, - Temperature: float64(C.gopsutil_v3_get_temperature(C.CString(key))), + Temperature: float64(C.gopsutil_v4_get_temperature(C.CString(key))), }) } return temperatures, nil diff --git a/sensors/smc_darwin.c b/sensors/smc_darwin.c index f0c3f3a63..c91a90cd0 100644 --- a/sensors/smc_darwin.c +++ b/sensors/smc_darwin.c @@ -69,7 +69,7 @@ typedef struct { static const int SMC_KEY_SIZE = 4; // number of characters in an SMC key. static io_connect_t conn; // our connection to the SMC. -kern_return_t gopsutil_v3_open_smc(void) { +kern_return_t gopsutil_v4_open_smc(void) { kern_return_t result; io_service_t service; @@ -86,7 +86,7 @@ kern_return_t gopsutil_v3_open_smc(void) { return result; } -kern_return_t gopsutil_v3_close_smc(void) { return IOServiceClose(conn); } +kern_return_t gopsutil_v4_close_smc(void) { return IOServiceClose(conn); } static uint32_t to_uint32(char *key) { uint32_t ans = 0; @@ -155,7 +155,7 @@ static kern_return_t read_smc(char *key, smc_return_t *result_smc) { return result; } -double gopsutil_v3_get_temperature(char *key) { +double gopsutil_v4_get_temperature(char *key) { kern_return_t result; smc_return_t result_smc; diff --git a/sensors/smc_darwin.h b/sensors/smc_darwin.h index 74ae55af6..e49abb512 100644 --- a/sensors/smc_darwin.h +++ b/sensors/smc_darwin.h @@ -26,8 +26,8 @@ #define THUNDERBOLT_1 "TI1P" #define WIRELESS_MODULE "TW0P" -kern_return_t gopsutil_v3_open_smc(void); -kern_return_t gopsutil_v3_close_smc(void); -double gopsutil_v3_get_temperature(char *); +kern_return_t gopsutil_v4_open_smc(void); +kern_return_t gopsutil_v4_close_smc(void); +double gopsutil_v4_get_temperature(char *); #endif // __SMC_H__