Add config settings for optional sensors

src/drivers.cpp

@@ -256,7 +256,8 @@ void HwmonFanDriver::set_speed(const Level *level)
 SensorDriver::SensorDriver(std::string path, std::vector<int> correction)
 : path_(path),
   correction_(correction),
-  num_temps_(0)
+  num_temps_(0),
+  optional_(false)
 {
 	std::ifstream f(path_);
 	if (!(f.is_open() && f.good()))
@@ -307,6 +308,15 @@ void SensorDriver::check_correction_length()
 }
 
 
+void SensorDriver::set_optional(bool o)
+{ optional_ = o; }
+
+bool SensorDriver::optional() const
+{ return optional_; }
+
+const string &SensorDriver::path() const
+{ return path_; }
+
 /*----------------------------------------------------------------------------
 | HwmonSensorDriver: A driver for sensors provided by other kernel drivers,  |
 | typically somewhere in sysfs.                                              |

src/drivers.h

@@ -90,11 +90,15 @@ class SensorDriver {
 	void set_correction(const std::vector<int> &correction);
 	void set_num_temps(unsigned int n);
 	bool operator == (const SensorDriver &other) const;
+	void set_optional(bool);
+	bool optional() const;
+	const string &path() const;
 protected:
 	string path_;
 	std::vector<int> correction_;
 private:
 	unsigned int num_temps_;
+	bool optional_;
 	void check_correction_length();
 };
 

src/error.h

@@ -27,6 +27,7 @@
 
 #include "message.h"
 #include "thinkfan.h"
+#include "drivers.h"
 
 #ifdef USE_YAML
 #include <yaml-cpp/exceptions.h>
@@ -73,11 +74,19 @@ class IOerror : public ExpectedError {
 	const int code_;
 public:
 	IOerror(const string &message, const int error_code);
-
 	int code();
 };
 
 
+class SensorLost : public ExpectedError {
+public:
+	template<class CauseT>
+	SensorLost(const CauseT &cause) {
+		msg_ = string("Lost sensor ") + cause.what();
+	}
+};
+
+
 class SyntaxError : public ExpectedError {
 public:
 	SyntaxError(const string filename, const std::ptrdiff_t offset, const string &input);

src/thinkfan.cpp

@@ -40,6 +40,7 @@
 #include "thinkfan.h"
 #include "config.h"
 #include "message.h"
+#include "error.h"
 
 
 namespace thinkfan {
@@ -52,6 +53,7 @@ seconds tmp_sleeptime = sleeptime;
 float bias_level(1.5);
 float depulse = 0;
 TemperatureState temp_state(0);
+bool can_lose_sensor = false;
 
 #ifdef USE_YAML
 std::vector<string> config_files { DEFAULT_YAML_CONFIG, DEFAULT_CONFIG };
@@ -92,6 +94,15 @@ void sig_handler(int signum) {
 
 
 
+static void sensor_lost(const SensorDriver *s, const ExpectedError &e) {
+	if (!s->optional())
+		error<SensorLost>(e);
+	else
+		log(TF_INF) << SensorLost(e).what();
+	temp_state.add_temp(0);
+}
+
+
 void run(const Config &config)
 {
 	tmp_sleeptime = sleeptime;
@@ -115,8 +126,16 @@ void run(const Config &config)
 
 		temp_state.restart();
 
-		for (const SensorDriver *sensor : config.sensors())
-			sensor->read_temps();
+		for (const SensorDriver *sensor : config.sensors()) {
+			try {
+				sensor->read_temps();
+			} catch (SystemError &e) {
+				sensor_lost(sensor, e);
+			} catch (IOerror &e) {
+				sensor_lost(sensor, e);
+			}
+		}
+
 		if (unlikely(!temp_state.complete()))
 			throw SystemError(MSG_SENSOR_LOST);
 

src/thinkfan.h

@@ -104,6 +104,7 @@ extern volatile int interrupted;
 extern TemperatureState temp_state;
 extern std::vector<string> config_files;
 extern float depulse;
+extern bool can_lose_sensor;
 
 
 }

src/yamlconfig.cpp

@@ -38,6 +38,7 @@ static const string kw_self(".");
 static const string kw_parent("..");
 static const string kw_indices("indices");
 static const string kw_correction("correction");
+static const string kw_optional("optional");
 
 #ifdef HAVE_OLD_YAMLCPP
 static inline Mark get_mark_compat(const Node &)
@@ -265,8 +266,11 @@ struct convert<vector<wtf_ptr<HwmonSensorDriver>>> {
 					sensor->set_correction(vector<int>(1, *it++));
 				});
 			}
-			for (const wtf_ptr<HwmonSensorDriver> &h : hwmons)
+			for (wtf_ptr<HwmonSensorDriver> &h : hwmons) {
+				if (node[kw_optional])
+					h->set_optional(node[kw_optional].as<bool>());
 				sensors.push_back(std::move(h));
+			}
 		}
 		else {
 			wtf_ptr<HwmonSensorDriver> h = make_wtf<HwmonSensorDriver>(path, correction);
@@ -298,6 +302,9 @@ struct convert<wtf_ptr<TpSensorDriver>> {
 		else
 			sensor = make_wtf<TpSensorDriver>(node[kw_tpacpi].as<string>(), correction);
 
+		if (node[kw_optional])
+			sensor->set_optional(node[kw_optional].as<bool>());
+
 		return true;
 	}
 };
@@ -316,6 +323,9 @@ struct convert<wtf_ptr<NvmlSensorDriver>> {
 			correction = node[kw_correction].as<vector<int>>();
 
 		sensor = make_wtf<NvmlSensorDriver>(node[kw_nvidia].as<string>(), correction);
+		if (node[kw_optional])
+			sensor->set_optional(node[kw_optional].as<bool>());
+
 		return true;
 	}
 };
@@ -335,6 +345,9 @@ struct convert<wtf_ptr<AtasmartSensorDriver>> {
 			correction = node[kw_correction].as<vector<int>>();
 
 		sensor = make_wtf<AtasmartSensorDriver>(node["atasmart"].as<string>(), correction);
+		if (node[kw_optional])
+			sensor->set_optional(node[kw_optional].as<bool>());
+
 		return true;
 	}
 };