Chore: remove temps_linux

Author: CarterLi

CMakeLists.txt

@@ -480,7 +480,6 @@ if(LINUX)
  src/detection/gtk_qt/qt.c
  src/detection/sound/sound_linux.c
  src/detection/swap/swap_linux.c
- src/detection/temps/temps_linux.c
  src/detection/terminalfont/terminalfont_linux.c
  src/detection/terminalshell/terminalshell_linux.c
  src/detection/terminalsize/terminalsize_linux.c
@@ -544,7 +543,6 @@ elseif(ANDROID)
  src/detection/processes/processes_linux.c
  src/detection/sound/sound_nosupport.c
  src/detection/swap/swap_linux.c
- src/detection/temps/temps_linux.c
  src/detection/terminalfont/terminalfont_android.c
  src/detection/terminalshell/terminalshell_linux.c
  src/detection/terminalsize/terminalsize_linux.c

src/detection/battery/battery_linux.c

@@ -1,6 +1,5 @@
 #include "battery.h"
 #include "common/io/io.h"
-#include "detection/temps/temps_linux.h"
 #include "util/stringUtils.h"
 
 #include <dirent.h>

src/detection/cpu/cpu_linux.c

@@ -2,13 +2,85 @@
 #include "common/io/io.h"
 #include "common/processing.h"
 #include "common/properties.h"
-#include "detection/temps/temps_linux.h"
 #include "util/mallocHelper.h"
 #include "util/stringUtils.h"
 
 #include <sys/sysinfo.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <dirent.h>
+
+static double parseHwmonDir(FFstrbuf* dir, FFstrbuf* buffer)
+{
+ //https://www.kernel.org/doc/Documentation/hwmon/sysfs-interface
+ uint32_t dirLength = dir->length;
+ ffStrbufAppendS(dir, "temp1_input");
+
+ if(!ffReadFileBuffer(dir->chars, buffer))
+ {
+ // Some badly implemented system put temp file in /hwmonN/device
+ ffStrbufSubstrBefore(dir, dirLength);
+ ffStrbufAppendS(dir, "device/");
+ dirLength = dir->length;
+ ffStrbufAppendS(dir, "temp1_input");
+
+ if(!ffReadFileBuffer(dir->chars, buffer))
+ return 0.0/0.0;
+ }
+
+ ffStrbufSubstrBefore(dir, dirLength);
+
+ double value = ffStrbufToDouble(buffer);// millidegree Celsius
+
+ if(value != value)
+ return 0.0/0.0;
+
+ ffStrbufAppendS(dir, "name");
+ if (!ffReadFileBuffer(dir->chars, buffer))
+ return 0.0/0.0;
+
+ ffStrbufTrimRightSpace(buffer);
+
+ if(
+ ffStrbufContainS(buffer, "cpu") ||
+ ffStrbufEqualS(buffer, "k10temp") || // AMD
+ ffStrbufEqualS(buffer, "coretemp") // Intel
+ ) return value / 1000.;
+
+ return false;
+}
+
+static double detectCPUTemp(void)
+{
+ FF_STRBUF_AUTO_DESTROY baseDir = ffStrbufCreateA(64);
+ ffStrbufAppendS(&baseDir, "/sys/class/hwmon/");
+
+ FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
+
+ uint32_t baseDirLength = baseDir.length;
+
+ FF_AUTO_CLOSE_DIR DIR* dirp = opendir(baseDir.chars);
+ if(dirp == NULL)
+ return 0.0/0.0;
+
+ struct dirent* entry;
+ while((entry = readdir(dirp)) != NULL)
+ {
+ if(entry->d_name[0] == '.')
+ continue;
+
+ ffStrbufAppendS(&baseDir, entry->d_name);
+ ffStrbufAppendC(&baseDir, '/');
+
+ double result = parseHwmonDir(&baseDir, &buffer);
+ if (result == result)
+ return result;
+
+ ffStrbufSubstrBefore(&baseDir, baseDirLength);
+ }
+
+ return 0.0/0.0;
+}
 
 #ifdef __ANDROID__
 #include "common/settings.h"
@@ -358,7 +430,7 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
  if(cpuinfo == NULL)
  return "fopen(\"/proc/cpuinfo\", \"r\") failed";
 
- cpu->temperature = options->temp ? ffDetectCPUTemp() : FF_CPU_TEMP_UNSET;
+ cpu->temperature = options->temp ? detectCPUTemp() : FF_CPU_TEMP_UNSET;
 
  FF_STRBUF_AUTO_DESTROY physicalCoresBuffer = ffStrbufCreate();
  FF_STRBUF_AUTO_DESTROY cpuMHz = ffStrbufCreate();

src/detection/gpu/gpu_linux.c

@@ -1,6 +1,5 @@
 #include "detection/gpu/gpu.h"
 #include "detection/vulkan/vulkan.h"
-#include "detection/temps/temps_linux.h"
 #include "detection/cpu/cpu.h"
 #include "detection/gpu/gpu_driver_specific.h"
 #include "common/io/io.h"

src/detection/physicaldisk/physicaldisk_linux.c

@@ -1,7 +1,6 @@
 #include "physicaldisk.h"
 #include "common/io/io.h"
 #include "common/properties.h"
-#include "detection/temps/temps_linux.h"
 #include "util/stringUtils.h"
 
 #include <ctype.h>