zeldon/htop
1
0
Fork 0
mirror of https://github.com/xzeldon/htop.git synced 2025-07-12 12:14:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Dynamically load libsensors at runtime

Browse Source
This commit is contained in:
Christian Göttsche
2020-12-01 13:59:19 +01:00
committed by BenBE
parent f7a8952933
commit b76eaf187a
11 changed files with 147 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
linux/Platform.c
View File

@ -61,10 +61,11 @@ in the source distribution for its full text.
#include "zfs/ZfsArcStats.h"
#include "zfs/ZfsCompressedArcMeter.h"
#ifdef HAVE_LIBSENSORS
#include <sensors/sensors.h>
#ifdef HAVE_SENSORS_SENSORS_H
#include "LibSensors.h"
#endif
ProcessField Platform_defaultFields[] = { PID, USER, PRIORITY, NICE, M_VIRT, M_RESIDENT, (int)M_SHARE, STATE, PERCENT_CPU, PERCENT_MEM, TIME, COMM, 0 };
int Platform_numberOfFields = LAST_PROCESSFIELD;
@ -119,14 +120,14 @@ void Platform_init(void) {
exit(1);
}
#ifdef HAVE_LIBSENSORS
sensors_init(NULL);
#ifdef HAVE_SENSORS_SENSORS_H
LibSensors_init(NULL);
#endif
}
void Platform_done(void) {
#ifdef HAVE_LIBSENSORS
sensors_cleanup();
#ifdef HAVE_SENSORS_SENSORS_H
LibSensors_cleanup();
#endif
}
@ -271,7 +272,7 @@ double Platform_setCPUValues(Meter* this, int cpu) {
v[CPU_METER_FREQUENCY] = cpuData->frequency;
#ifdef HAVE_LIBSENSORS
#ifdef HAVE_SENSORS_SENSORS_H
v[CPU_METER_TEMPERATURE] = cpuData->temperature;
#else
v[CPU_METER_TEMPERATURE] = NAN;