vtorri
/
evisum
forked from enlightenment/evisum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

coretemp: take topology into account

This commit is contained in:
Alastair Poole 2020-10-14 11:32:41 +01:00
parent cc9b7e6e7f
commit 3ec2144f89
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/bin/system/machine/cpu.bogox
View File

@ -279,6 +279,9 @@ system_cpu_usage_get(int *ncpu)
return system_cpu_usage_delayed_get(ncpu, 1000000); return system_cpu_usage_delayed_get(ncpu, 1000000);
} }
static int _cpu_temp_min = 0;
static int _cpu_temp_max = 100;
static char _core_temps[256][512]; static char _core_temps[256][512];
static char _hwmon_path[256]; static char _hwmon_path[256];
@ -315,16 +318,26 @@ _cpu_n_temperature_read(int n)
typedef struct _thermal_drv { typedef struct _thermal_drv {
const char *name; const char *name;
void (*init)(void); void (*init)(void);
char min;
char max;
} thermal_drv; } thermal_drv;
static void static void
_coretemp_init(void) _coretemp_init(void)
{ {
int i, cpu_count = system_cpu_count_get(); char buf[4096];
int cpu_count = system_cpu_count_get();
for (int j = 0; j < cpu_count; j++) for (int j = 0; j < cpu_count; j++)
{ {
i = 2 + ((cpu_count + j) / 2) - (cpu_count / 2); snprintf(buf, sizeof(buf), "/sys/devices/system/cpu/cpu%i/topology/core_id", j);
snprintf(_core_temps[j], sizeof(_core_temps[j]), "%s/temp%d_input", _hwmon_path, i); char *b = file_contents(buf);
if (b)
{
int core_id = atoi(b);
snprintf(_core_temps[j], sizeof(_core_temps[j]), "%s/temp%d_input", _hwmon_path, 2 + core_id);
free(b);
}
} }
} }
@ -346,8 +359,8 @@ system_cpu_n_temperature_get(int n)
static int init = 0; static int init = 0;
thermal_drv drivers[] = { thermal_drv drivers[] = {
{ "coretemp", _coretemp_init }, { "coretemp", _coretemp_init, 0, 100 },
{ "k10temp", _k10_init }, { "k10temp", _k10_init, 0, 100 },
}; };
if (!init) if (!init)
@ -415,8 +428,9 @@ system_cpu_n_temperature_get(int n)
int int
system_cpu_temperature_min_max_get(int *min, int *max) system_cpu_temperature_min_max_get(int *min, int *max)
{ {
*min = 20;
*max = 100; *min = _cpu_temp_min;
*max = _cpu_temp_max;
return 0; return 0;
} }