Add support for zero-fan mode, fix sensor identifiers

PKGBUILD

@@ -6,14 +6,16 @@ url='https://github.com/Tabascl/fantasize.git'
 source=("$pkgname-$pkgver.tar.gz::https://github.com/Tabascl/fantasize/archive/refs/tags/v$pkgver.tar.gz")
 arch=('x86_64')
 license=('GPL3')
-makedepends=('git' 'cmake' 'nlohmann-json' 'boost')
+makedepends=('git' 'meson' 'nlohmann-json' 'boost')
 sha256sums=('SKIP')
 
 build() {
-    cmake -S "$pkgname-$pkgver/app" -B build -DCMAKE_BUILD_TYPE=Release
-    cmake --build build
+    meson setup build "$pkgname-$pkgver/app" -Dbuildtype=Release
+    cd build
+    meson compile
 }
 
 package() {
-    cmake --install build --prefix "$pkgdir/" --verbose
+    cd build
+    meson install
 }

app/CMakeLists.txt

@@ -1,39 +0,0 @@
-cmake_minimum_required(VERSION 3.0)
-
-project(fantasize VERSION 0.1.8)
-
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-
-find_package(nlohmann_json 3.11.2 REQUIRED)
-find_package(Boost 1.74 COMPONENTS program_options log log_setup date_time REQUIRED)
-
-add_executable(${PROJECT_NAME}
-  src/main.cxx
-  src/sensor/LMSensorsFacade.cxx
-#  src/sensor/GPUSensorsFacade.cxx
-  src/sensor/Sensor.cxx
-#  src/sensor/NvidiaSensor.cxx
-  src/sensor/LMSensor.cxx
-  src/pwm/PWMControl.cxx
-  src/pwm/PWMControlFacade.cxx
-  src/fan/HwmonFan.cxx
-  src/fan/FanCurve.cxx
-  src/fan/FanLabeler.cxx
-  src/fan/Aggregators.cxx
-  src/FanGenerator.cxx
-  src/Serializer.cxx
-  src/sensor/SensorManager.cxx
-  src/Controller.cxx
-  src/Settings.cxx
-  src/App.cxx
-)
-
-set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 20)
-
-# target_include_directories(${PROJECT_NAME} PUBLIC include /opt/cuda)
-target_include_directories(${PROJECT_NAME} PUBLIC include)
-# target_link_libraries(${PROJECT_NAME} PUBLIC sensors nvidia-ml nlohmann_json::nlohmann_json tbb ${Boost_LIBRARIES})
-target_link_libraries(${PROJECT_NAME} PUBLIC sensors nlohmann_json::nlohmann_json tbb ${Boost_LIBRARIES})
-
-install(TARGETS ${PROJECT_NAME} DESTINATION usr/local/bin)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/unit/fantasize.service DESTINATION usr/lib/systemd/system)

app/include/fan/Fan.h

@@ -17,6 +17,9 @@ public:
   virtual void StartPWM(int value) = 0;
   virtual int StartPWM() = 0;
 
+  virtual void ZeroFanModeSupported(bool value) = 0;
+  virtual bool ZeroFanModeSupported() = 0;
+
   virtual void FindPWMLimits() = 0;
   virtual void AdjustPWMLimits() = 0;
 };

app/include/fan/HwmonFan.h

@@ -24,6 +24,9 @@ public:
   void StartPWM(int value) override;
   int StartPWM() override;
 
+  void ZeroFanModeSupported(bool value) override;
+  bool ZeroFanModeSupported() override;
+
   void FindPWMLimits() override;
   void AdjustPWMLimits() override;
 
@@ -36,8 +39,9 @@ private:
   std::shared_ptr<Sensor> mRpmSensor;
   std::string mLabel;
 
-  int mMinPWM;
-  int mStartPWM;
+  int mMinPWM = 0;
+  int mStartPWM = 0;
+  bool mZeroFanModeSupported = false;
   std::chrono::time_point<std::chrono::steady_clock> mLastAdjustmentTime;
 };
 

app/meson.build

@@ -0,0 +1,37 @@
+project('fantasize', 'cpp', version : '0.2.0', default_options : ['cpp_std=c++20'])
+
+src = [
+  'src/main.cxx',
+  'src/sensor/LMSensorsFacade.cxx',
+  'src/sensor/Sensor.cxx',
+  'src/sensor/LMSensor.cxx',
+  'src/pwm/PWMControl.cxx',
+  'src/pwm/PWMControlFacade.cxx',
+  'src/fan/HwmonFan.cxx',
+  'src/fan/FanCurve.cxx',
+  'src/fan/FanLabeler.cxx',
+  'src/fan/Aggregators.cxx',
+  'src/FanGenerator.cxx',
+  'src/Serializer.cxx',
+  'src/sensor/SensorManager.cxx',
+  'src/Controller.cxx',
+  'src/Settings.cxx',
+  'src/App.cxx'
+]
+
+deps = [
+  dependency('nlohmann_json'),
+  dependency('boost', modules : ['program_options', 'log', 'log_setup', 'date_time', 'thread']),
+  dependency('tbb'),
+  meson.get_compiler('cpp').find_library('sensors')
+]
+
+inc = include_directories('include')
+
+exe = executable('fantasize',
+  src,
+  dependencies: deps,
+  install: true,
+  include_directories: inc)
+
+install_data('unit/fantasize.service', install_dir : 'usr/lib/systemd/system')

app/src/Serializer.cxx

@@ -13,16 +13,13 @@
 using namespace std;
 namespace fs = filesystem;
 
-Serializer::Serializer()
-{
+Serializer::Serializer() {
   if (!fs::exists(SERIALIZATION_DIR)) {
     fs::create_directory(SERIALIZATION_DIR);
   }
 }
 
-void
-Serializer::SerializeFans(vector<shared_ptr<Fan>> fans)
-{
+void Serializer::SerializeFans(vector<shared_ptr<Fan>> fans) {
   json obj;
 
   for (auto f : fans) {
@@ -33,8 +30,7 @@ Serializer::SerializeFans(vector<shared_ptr<Fan>> fans)
 }
 
 vector<shared_ptr<Fan>>
-Serializer::DeserializeFans(vector<shared_ptr<Sensor>> availableSensors)
-{
+Serializer::DeserializeFans(vector<shared_ptr<Sensor>> availableSensors) {
   vector<shared_ptr<Fan>> fans;
 
   // Create a for the sensors first, then searching becomes cheaper
@@ -45,37 +41,37 @@ Serializer::DeserializeFans(vector<shared_ptr<Sensor>> availableSensors)
 
   auto data = ReadJson();
   try {
-    for (auto& el : data["fans"].items()) {
+    for (auto &el : data["fans"].items()) {
       auto pwmControl = make_shared<PWMControl>(el.value()["PWMControl"]);
       auto rpmSensor = sensorMap[el.value()["LMSensor"]];
 
       int minPWM = el.value()["MinPWM"];
       int startPWM = el.value()["StartPWM"];
       string label = el.value()["Label"];
+      bool zeroFan = el.value()["ZeroFan"];
 
       auto fan = make_shared<HwmonFan>(pwmControl, rpmSensor);
       fan->MinPWM(minPWM);
       fan->StartPWM(startPWM);
       fan->Label(label);
+      fan->ZeroFanModeSupported(zeroFan);
 
       fans.push_back(fan);
     }
-  } catch (const std::exception& e) {
+  } catch (const std::exception &e) {
     std::cout << "Deserialization error! Message: " << e.what() << std::endl;
   }
   return fans;
 }
 
-void
-Serializer::WriteJson(json o)
-{
+void Serializer::WriteJson(json o) {
   json obj;
 
   if (fs::exists(fs::path(SERIALIZATION_DIR) / FANS_JSON_FILENAME)) {
     obj = ReadJson();
   }
 
-  for (auto& [key, value] : o.items()) {
+  for (auto &[key, value] : o.items()) {
     obj[key] = value;
   }
 
@@ -83,18 +79,14 @@ Serializer::WriteJson(json o)
   ostrm << obj.dump(2) << "\n";
 }
 
-json
-Serializer::ReadJson()
-{
+json Serializer::ReadJson() {
   ifstream istrm(fs::path(SERIALIZATION_DIR) / FANS_JSON_FILENAME);
   return json::parse(istrm);
 }
 
-vector<shared_ptr<FanCurve>>
-Serializer::DeserializeFanCurves(
-  std::vector<std::shared_ptr<Sensor>> availableSensors,
-  std::vector<std::shared_ptr<Fan>> availableFans)
-{
+vector<shared_ptr<FanCurve>> Serializer::DeserializeFanCurves(
+    std::vector<std::shared_ptr<Sensor>> availableSensors,
+    std::vector<std::shared_ptr<Fan>> availableFans) {
   auto data = ReadJson();
 
   map<string, shared_ptr<Sensor>> sensorMap;
@@ -109,47 +101,44 @@ Serializer::DeserializeFanCurves(
 
   vector<shared_ptr<FanCurve>> curves;
 
-  for (auto& el : data["fancurves"].items()) {
+  for (auto &el : data["fancurves"].items()) {
     vector<FanStep> steps;
     vector<shared_ptr<Sensor>> sensors;
     vector<shared_ptr<Fan>> fans;
 
-    for (auto& step : el.value()["FanSteps"].items()) {
-      steps.push_back(FanStep{ step.value()[0], step.value()[1] });
+    for (auto &step : el.value()["FanSteps"].items()) {
+      steps.push_back(FanStep{step.value()[0], step.value()[1]});
     }
 
-    for (auto& sensor : el.value()["Sensors"].items()) {
+    for (auto &sensor : el.value()["Sensors"].items()) {
       if (sensorMap.contains(sensor.value()))
         sensors.push_back(sensorMap[sensor.value()]);
     }
 
-    for (auto& fan : el.value()["Fans"].items()) {
+    for (auto &fan : el.value()["Fans"].items()) {
       if (fanMap.contains(fan.value()))
         fans.push_back(fanMap[fan.value()]);
     }
 
     std::unique_ptr<Aggregator> aggregator =
-      aggregatorFromString(el.value()["AggregateFunction"]);
+        aggregatorFromString(el.value()["AggregateFunction"]);
 
     curves.push_back(
-      make_shared<FanCurve>(steps, sensors, fans, std::move(aggregator)));
+        make_shared<FanCurve>(steps, sensors, fans, std::move(aggregator)));
   }
 
   return curves;
 }
 
 std::unique_ptr<Aggregator>
-Serializer::aggregatorFromString(std::string str) const
-{
+Serializer::aggregatorFromString(std::string str) const {
   if (str == "max")
     return std::make_unique<MaxAggregator>();
   else
     return std::make_unique<AverageAggregator>();
 }
 
-shared_ptr<Settings>
-Serializer::DeserializeSettings()
-{
+shared_ptr<Settings> Serializer::DeserializeSettings() {
   int frequency = FREQUENCY_DEFAULT;
 
   auto data = ReadJson();

app/src/fan/FanCurve.cxx

@@ -12,22 +12,17 @@ FanCurve::FanCurve(std::vector<FanStep> steps,
                    std::vector<std::shared_ptr<Sensor>> sensors,
                    std::vector<std::shared_ptr<Fan>> fans,
                    std::unique_ptr<Aggregator> aggregator)
-  : mSteps(steps)
-  , mTempSensors(sensors)
-  , mFans(fans)
-  , mAggregator(std::move(aggregator))
-{
+    : mSteps(steps), mTempSensors(sensors), mFans(fans),
+      mAggregator(std::move(aggregator)) {
   PrintInfo();
 }
 
-void
-FanCurve::DoFanControl()
-{
+void FanCurve::DoFanControl() {
   BOOST_LOG_FUNCTION();
 
   int temp = AggregateTemperature();
 
-  int t0, t1, p0, p1;
+  int t0 = 0, t1 = 0, p0 = 0, p1 = 0;
   int targetFanPower;
 
   if (temp <= mSteps[0].Temp) {
@@ -35,7 +30,7 @@ FanCurve::DoFanControl()
   } else if (temp > mSteps[mSteps.size() - 1].Temp) {
     targetFanPower = mSteps[mSteps.size() - 1].Percent;
   } else {
-    for (int i = 0; i < mSteps.size(); i++) {
+    for (int i = 0; i < (int)mSteps.size(); i++) {
       if (temp > mSteps[i].Temp) {
         t0 = mSteps[i].Temp;
         p0 = mSteps[i].Percent;
@@ -49,7 +44,7 @@ FanCurve::DoFanControl()
   }
 
   for (auto f : mFans) {
-    if (f->RPM() <= 0) {
+    if (!f->ZeroFanModeSupported() && f->RPM() <= 0) {
       BOOST_LOG_TRIVIAL(warning) << "Fan stopped completely!";
       f->PWM(f->StartPWM());
       f->AdjustPWMLimits();
@@ -59,15 +54,11 @@ FanCurve::DoFanControl()
   }
 }
 
-int
-FanCurve::AggregateTemperature()
-{
+int FanCurve::AggregateTemperature() {
   return mAggregator->aggregate(mTempSensors);
 }
 
-void
-FanCurve::PrintInfo()
-{
+void FanCurve::PrintInfo() {
   BOOST_LOG_FUNCTION()
 
   BOOST_LOG_TRIVIAL(info) << "### Fan curve:";

app/src/fan/HwmonFan.cxx

@@ -39,6 +39,12 @@ void HwmonFan::StartPWM(int value) { mStartPWM = value; }
 
 int HwmonFan::StartPWM() { return mStartPWM; }
 
+void HwmonFan::ZeroFanModeSupported(bool value) {
+  mZeroFanModeSupported = value;
+}
+
+bool HwmonFan::ZeroFanModeSupported() { return mZeroFanModeSupported; }
+
 void HwmonFan::FindPWMLimits() {
   cout << "Looking for minimal PWM" << endl;
   int minPWM = 0;
@@ -95,11 +101,9 @@ void HwmonFan::AdjustPWMLimits() {
 
 json HwmonFan::toJson() const {
   json obj;
-  obj = {mPWMControl->toJson(),
-         mRpmSensor->toJson(),
-         {"Label", mLabel},
-         {"MinPWM", mMinPWM},
-         {"StartPWM", mStartPWM}};
+  obj = {mPWMControl->toJson(),   mRpmSensor->toJson(),
+         {"Label", mLabel},       {"MinPWM", mMinPWM},
+         {"StartPWM", mStartPWM}, {"ZeroFan", mZeroFanModeSupported}};
   return obj;
 }
 

app/src/sensor/LMSensor.cxx

@@ -1,3 +1,5 @@
+#include <iostream>
+
 #include <boost/json/kind.hpp>
 #include <sensor/LMSensor.h>
 #include <sensors/sensors.h>
@@ -17,7 +19,9 @@ int LMSensor::value() {
 }
 
 const string LMSensor::toString() const {
-  return sensors_get_label(mChipName, mFeature);
+  ostringstream os;
+  os << mChipName->prefix << "." << sensors_get_label(mChipName, mFeature);
+  return os.str();
 }
 
 json LMSensor::toJson() const {