enlightenment/evisum
enlightenment
/
evisum
7
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

temps...freeebsd....

This commit is contained in:
Alastair Poole 2020-10-08 13:20:43 +01:00
parent 64050fc9c0
commit 4d5baa6498
1 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -280,20 +280,33 @@ system_cpu_usage_get(int *ncpu)
} }
static char _core_temp[128][512]; static char _core_temps[256][512];
static char _hwmon_path[256]; static char _hwmon_path[256];
int int
_cpu_n_temperature_read(int n) _cpu_n_temperature_read(int n)
{ {
int temp = -1; int temp = -1;
#if defined(__linux__)
char *b = file_contents(_core_temp[n]); char *b = file_contents(_core_temps[n]);
if (b) if (b)
{ {
temp = atoi(b) / 1000; temp = atoi(b) / 1000;
free(b); free(b);
} }
#elif defined(__FreeBSD__)
int value;
size_t len = sizeof(value);
if (!_core_temps[n][0])
snprintf(_core_temps[n], sizeof(_core_temps[n]), "dev.cpu.%d.temperature", n);
if ((sysctlbyname(_core_temps[n], &value, &len, NULL, 0)) != -1)
{
temp = (value - 2732) / 10;
}
#endif
return temp; return temp;
} }
@ -310,7 +323,7 @@ system_cpu_n_temperature_get(int n)
struct dirent *dh; struct dirent *dh;
DIR *dir; DIR *dir;
memset(&_core_temp, 0, sizeof(_core_temp)); memset(&_core_temps, 0, sizeof(_core_temps));
memset(&_hwmon_path, 0, sizeof(_hwmon_path)); memset(&_hwmon_path, 0, sizeof(_hwmon_path));
dir = opendir("/sys/class/hwmon"); dir = opendir("/sys/class/hwmon");
@ -344,15 +357,25 @@ system_cpu_n_temperature_get(int n)
if (!_hwmon_path[0]) return -1; if (!_hwmon_path[0]) return -1;
if (_core_temp[n][0]) if (_core_temps[n][0])
return _cpu_n_temperature_read(n); return _cpu_n_temperature_read(n);
cpu_count = system_cpu_count_get(); cpu_count = system_cpu_count_get();
i = 1 + ((cpu_count + n) / 2) - (cpu_count / 2); i = 1 + ((cpu_count + n) / 2) - (cpu_count / 2);
snprintf(_core_temp[n], sizeof(_core_temp[n]), "%s/temp%d_input", _hwmon_path, i); snprintf(_core_temps[n], sizeof(_core_temps[n]), "%s/temp%d_input", _hwmon_path, i);
return _cpu_n_temperature_read(n); return _cpu_n_temperature_read(n);
#elif defined(__FreeBSD__) || defined(__DragonFly__)
static int init = 1;
if (!init)
{
memset(&_core_temps, 0, sizeof(_core_temps));
init = 0;
}
return _cpu_n_temperature_read(n);
#endif #endif
return -1; return -1;
} }