diff options
author | Ondrej Čerman | 2019-06-22 13:40:18 +0200 |
---|---|---|
committer | Ondrej Čerman | 2019-06-22 13:40:18 +0200 |
commit | 1d8cfab2924b937059fab9a15a94af410772234d (patch) | |
tree | a66a09cb5581bae92bd9bd77858dde9dd49f635c | |
parent | e5c1fa71b7775e7dfcb1ca0097545644a229b8c5 (diff) |
Added support for multiple threadripper nodes for zenpower d.
-rw-r--r-- | src/ss/zenpower.c | 104 |
1 files changed, 81 insertions, 23 deletions
diff --git a/src/ss/zenpower.c b/src/ss/zenpower.c index d9f8600..3d0c01c 100644 --- a/src/ss/zenpower.c +++ b/src/ss/zenpower.c @@ -2,7 +2,8 @@ #include "zenmonitor.h" #include "zenpower.h" -static gchar *zenpowerDir = NULL; +GSList *zp_sensors = NULL; +static int nodes = 0; typedef struct { @@ -10,23 +11,41 @@ typedef struct const gchar *file; const gchar *printf_format; const double adjust_ratio; +} HwmonSensorType; + +typedef struct +{ float current_value; float min; float max; + HwmonSensorType *type; + gchar *hwmon_dir; + int node; } HwmonSensor; -HwmonSensor hwmon_sensors[] = { - {"CPU Temperature (tCtrl)", "temp1_input", " %6.2f°C", 1000.0, 0.0, 999.0, 0.0}, - {"CPU Temperature (tDie)", "temp2_input", " %6.2f°C", 1000.0, 0.0, 999.0, 0.0}, - {"CPU Core Voltage (SVI2)", "in1_input", " %8.3f V", 1000.0, 0.0, 999.0, 0.0}, - {"SOC Voltage (SVI2)", "in2_input", " %8.3f V", 1000.0, 0.0, 999.0, 0.0}, - {"CPU Core Current (SVI2)", "curr1_input", " %8.3f A", 1000.0, 0.0, 999.0, 0.0}, - {"SOC Current (SVI2)", "curr2_input", " %8.3f A", 1000.0, 0.0, 999.0, 0.0}, - {"CPU Core Power (SVI2)", "power1_input", " %8.3f W", 1000000.0, 0.0, 999.0, 0.0}, - {"SOC Power (SVI2)", "power2_input", " %8.3f W", 1000000.0, 0.0, 999.0, 0.0}, +static HwmonSensorType hwmon_stype[] = { + {"CPU Temperature (tCtrl)", "temp1_input", " %6.2f°C", 1000.0}, + {"CPU Temperature (tDie)", "temp2_input", " %6.2f°C", 1000.0}, + {"CPU Core Voltage (SVI2)", "in1_input", " %8.3f V", 1000.0}, + {"SOC Voltage (SVI2)", "in2_input", " %8.3f V", 1000.0}, + {"CPU Core Current (SVI2)", "curr1_input", " %8.3f A", 1000.0}, + {"SOC Current (SVI2)", "curr2_input", " %8.3f A", 1000.0}, + {"CPU Core Power (SVI2)", "power1_input", " %8.3f W", 1000000.0}, + {"SOC Power (SVI2)", "power2_input", " %8.3f W", 1000000.0}, {0, NULL} }; +static gboolean hwmon_file_exists(const gchar *dir, const gchar *file) { + gchar *full_path; + gboolean result; + + full_path = g_strdup_printf("/sys/class/hwmon/%s/%s", dir, file); + result = g_file_test(full_path, G_FILE_TEST_EXISTS); + + g_free(full_path); + return result; +} + static gboolean read_raw_hwmon_value(const gchar *dir, const gchar *file, gchar **result) { gchar *full_path; gboolean file_result; @@ -38,10 +57,22 @@ static gboolean read_raw_hwmon_value(const gchar *dir, const gchar *file, gchar return file_result; } +static HwmonSensor *hwmon_sensor_new(HwmonSensorType *type, const gchar *dir, gint node) { + HwmonSensor *s; + s = g_new0(HwmonSensor, 1); + s->min = 999.0; + s->type = type; + s->hwmon_dir = g_strdup(dir); + s->node = node; + return s; +} + gboolean zenpower_init() { GDir *hwmon; const gchar *entry; - gchar* name = NULL; + gchar *name = NULL; + HwmonSensorType *type; + HwmonSensor *sensor; hwmon = g_dir_open("/sys/class/hwmon", 0, NULL); if (!hwmon) @@ -49,25 +80,37 @@ gboolean zenpower_init() { while ((entry = g_dir_read_name(hwmon))) { read_raw_hwmon_value(entry, "name", &name); + if (strcmp(g_strchomp(name), "zenpower") == 0) { - zenpowerDir = g_strdup(entry); - break; + + for (type = hwmon_stype; type->label; type++) { + if (hwmon_file_exists(entry, type->file)) { + zp_sensors = g_slist_append(zp_sensors, hwmon_sensor_new(type, entry, nodes)); + } + } + nodes++; + } g_free(name); } - if (!zenpowerDir) + if (zp_sensors == NULL) return FALSE; + + return TRUE; } void zenpower_update() { gchar *tmp = NULL; - GSList *list = NULL; + GSList *node; HwmonSensor *sensor; - for (sensor = hwmon_sensors; sensor->label; sensor++) { - if (read_raw_hwmon_value(zenpowerDir, sensor->file, &tmp)){ - sensor->current_value = atof(tmp) / sensor->adjust_ratio; + node = zp_sensors; + while(node) { + sensor = (HwmonSensor *)node->data; + + if (read_raw_hwmon_value(sensor->hwmon_dir, sensor->type->file, &tmp)){ + sensor->current_value = atof(tmp) / sensor->type->adjust_ratio; if (sensor->current_value < sensor->min) sensor->min = sensor->current_value; @@ -80,31 +123,46 @@ void zenpower_update() { else{ sensor->current_value = ERROR_VALUE; } + node = node->next; } } void zenpower_clear_minmax() { HwmonSensor *sensor; - - for (sensor = hwmon_sensors; sensor->label; sensor++) { + GSList *node; + node = zp_sensors; + while(node) { + sensor = (HwmonSensor *)node->data; sensor->min = sensor->current_value; sensor->max = sensor->current_value; + node = node->next; } } GSList* zenpower_get_sensors() { GSList *list = NULL; HwmonSensor *sensor; + GSList *node; SensorInit *data; - for (sensor = hwmon_sensors; sensor->label; sensor++) { + node = zp_sensors; + while(node) { + sensor = (HwmonSensor *)node->data; + data = sensor_init_new(); - data->label = g_strdup(sensor->label); + if (nodes > 1){ + data->label = g_strdup_printf("Node %d - %s", sensor->node, sensor->type->label); + } + else{ + data->label = g_strdup(sensor->type->label); + } data->value = &sensor->current_value; data->min = &sensor->min; data->max = &sensor->max; - data->printf_format = sensor->printf_format; + data->printf_format = sensor->type->printf_format; list = g_slist_append(list, data); + + node = node->next; } return list; |