aboutsummaryrefslogtreecommitdiff
path: root/src/ss
diff options
context:
space:
mode:
authorOndrej Čerman2020-06-14 23:28:09 +0200
committerOndrej Čerman2020-06-14 23:29:01 +0200
commitfa17e94b30611513c7b863422a1215fcea74f369 (patch)
tree280a012c2d465befe33904dfdd47ea827bb1b172 /src/ss
parent86d6046bbd3ebb110465bb0ccd009dbc86e71d69 (diff)
Added tooltips for sensorsv1.4.2
Version 1.4.2
Diffstat (limited to 'src/ss')
-rw-r--r--src/ss/msr.c3
-rw-r--r--src/ss/os.c1
-rw-r--r--src/ss/zenpower.c38
3 files changed, 26 insertions, 16 deletions
diff --git a/src/ss/msr.c b/src/ss/msr.c
index bb4361c..258d46c 100644
--- a/src/ss/msr.c
+++ b/src/ss/msr.c
@@ -202,6 +202,7 @@ GSList* msr_get_sensors() {
data = sensor_init_new();
data->label = g_strdup("Package Power");
+ data->hint = g_strdup("Package Power reported by RAPL\nSource: cpu0 MSR");
data->value = &package_power;
data->min = &package_power_min;
data->max = &package_power_max;
@@ -211,6 +212,7 @@ GSList* msr_get_sensors() {
for (i = 0; i < cores; i++) {
data = sensor_init_new();
data->label = g_strdup_printf("Core %d Effective Frequency", display_coreid ? cpu_dev_ids[i].coreid: i);
+ data->hint = g_strdup_printf("Source: cpu%d MSR", cpu_dev_ids[i].cpuid);
data->value = &(core_fid[i]);
data->min = &(core_fid_min[i]);
data->max = &(core_fid_max[i]);
@@ -221,6 +223,7 @@ GSList* msr_get_sensors() {
for (i = 0; i < cores; i++) {
data = sensor_init_new();
data->label = g_strdup_printf("Core %d Power", display_coreid ? cpu_dev_ids[i].coreid: i);
+ data->hint = g_strdup_printf("Core Power reported by RAPL\nSource: cpu%d MSR", cpu_dev_ids[i].cpuid);
data->value = &(core_power[i]);
data->min = &(core_power_min[i]);
data->max = &(core_power_max[i]);
diff --git a/src/ss/os.c b/src/ss/os.c
index 8543c5f..c2beb04 100644
--- a/src/ss/os.c
+++ b/src/ss/os.c
@@ -86,6 +86,7 @@ GSList* os_get_sensors(void) {
for (i = 0; i < cores; i++) {
data = sensor_init_new();
data->label = g_strdup_printf("Core %d Frequency", display_coreid ? cpu_dev_ids[i].coreid: i);
+ data->hint = g_strdup_printf("Current frequency of the CPU as determined by the governor and cpufreq core.\n Source: %s", frq_files[i]);
data->value = &(core_freq[i]);
data->min = &(core_freq_min[i]);
data->max = &(core_freq_max[i]);
diff --git a/src/ss/zenpower.c b/src/ss/zenpower.c
index 56c686d..2bf762b 100644
--- a/src/ss/zenpower.c
+++ b/src/ss/zenpower.c
@@ -10,6 +10,7 @@ static int nodes = 0;
typedef struct
{
const gchar *label;
+ const gchar *hint;
const gchar *file;
const gchar *printf_format;
const double adjust_ratio;
@@ -26,22 +27,26 @@ typedef struct
} HwmonSensor;
static HwmonSensorType hwmon_stype[] = {
- {"CPU Temperature (tCtl)", "temp1_input", " %6.2f°C", 1000.0},
- {"CPU Temperature (tDie)", "temp2_input", " %6.2f°C", 1000.0},
- {"CCD1 Temperature", "temp3_input", " %6.2f°C", 1000.0},
- {"CCD2 Temperature", "temp4_input", " %6.2f°C", 1000.0},
- {"CCD3 Temperature", "temp5_input", " %6.2f°C", 1000.0},
- {"CCD4 Temperature", "temp6_input", " %6.2f°C", 1000.0},
- {"CCD5 Temperature", "temp7_input", " %6.2f°C", 1000.0},
- {"CCD6 Temperature", "temp8_input", " %6.2f°C", 1000.0},
- {"CCD7 Temperature", "temp9_input", " %6.2f°C", 1000.0},
- {"CCD8 Temperature", "temp10_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},
+ {"CPU Temperature (tCtl)", "Reported CPU Temperature", "temp1_input", " %6.2f°C", 1000.0},
+ {"CPU Temperature (tDie)", "Reported CPU Temperature - offset", "temp2_input", " %6.2f°C", 1000.0},
+ {"CCD1 Temperature", "Core Complex Die 1 Temperature", "temp3_input", " %6.2f°C", 1000.0},
+ {"CCD2 Temperature", "Core Complex Die 2 Temperature", "temp4_input", " %6.2f°C", 1000.0},
+ {"CCD3 Temperature", "Core Complex Die 3 Temperature", "temp5_input", " %6.2f°C", 1000.0},
+ {"CCD4 Temperature", "Core Complex Die 4 Temperature", "temp6_input", " %6.2f°C", 1000.0},
+ {"CCD5 Temperature", "Core Complex Die 5 Temperature", "temp7_input", " %6.2f°C", 1000.0},
+ {"CCD6 Temperature", "Core Complex Die 6 Temperature", "temp8_input", " %6.2f°C", 1000.0},
+ {"CCD7 Temperature", "Core Complex Die 7 Temperature", "temp9_input", " %6.2f°C", 1000.0},
+ {"CCD8 Temperature", "Core Complex Die 8 Temperature", "temp10_input", " %6.2f°C", 1000.0},
+ {"CPU Core Voltage (SVI2)", "Core Voltage reported by SVI2 telemetry", "in1_input", " %8.3f V", 1000.0},
+ {"SOC Voltage (SVI2)", "SOC Voltage reported by SVI2 telemetry", "in2_input", " %8.3f V", 1000.0},
+ {"CPU Core Current (SVI2)", "Core Current reported by SVI2 telemetry\n"
+ "Note: May not be accurate on some systems", "curr1_input", " %8.3f A", 1000.0},
+ {"SOC Current (SVI2)", "SOC Current reported by SVI2 telemetry\n"
+ "Note: May not be accurate on some systems", "curr2_input", " %8.3f A", 1000.0},
+ {"CPU Core Power (SVI2)", "Core Voltage * Current\n"
+ "Note: May not be accurate on some systems", "power1_input", " %8.3f W", 1000000.0},
+ {"SOC Power (SVI2)", "Core Voltage * Current\n"
+ "Note: May not be accurate on some systems", "power2_input", " %8.3f W", 1000000.0},
{0, NULL}
};
@@ -165,6 +170,7 @@ GSList* zenpower_get_sensors() {
else{
data->label = g_strdup(sensor->type->label);
}
+ data->hint = g_strdup_printf("%s\nSource: zenpower %s/%s", sensor->type->hint, sensor->hwmon_dir, sensor->type->file);
data->value = &sensor->current_value;
data->min = &sensor->min;
data->max = &sensor->max;