Speed up the boot time of PSU Sensors
Currently, on some PSU, PSU Sensor daemon will take very long time to work
stably, and it needs very long time before PSU Sensor daemon can provide all
D-Bus interface for PSU Sensors.
Since all PSU label in sysfs will not stay in subdirectory, no need to use
findFiles to check label files since findFiles will cost a lot of time.
Tested:
Run ipmitool sensor list, all PSU sensors will show correctly.
Pid Control service will not restart again and again owing to PSU Fan Speed
D-Bus interface not ready.
Signed-off-by: Cheng C Yang <cheng.c.yang@linux.intel.com>
Change-Id: I49a537e13e0aa4f96b83e9d8b9e44e750d22ac5e
diff --git a/src/PSUSensorMain.cpp b/src/PSUSensorMain.cpp
index c3097e7..d66e5be 100644
--- a/src/PSUSensorMain.cpp
+++ b/src/PSUSensorMain.cpp
@@ -334,33 +334,19 @@
std::string sensorNameSubStr =
sensorNameStr.substr(0, sensorNameStr.find("_") - 1);
- std::string labelPathStr =
- boost::replace_all_copy(sensorNameStr, "input", "label");
- std::vector<fs::path> labelPaths;
- if (!findFiles(directory, labelPathStr, labelPaths, 0))
+ auto labelPath =
+ boost::replace_all_copy(sensorPathStr, "input", "label");
+ std::ifstream labelFile(labelPath);
+ if (!labelFile.good())
{
- std::cerr << "No PSU non-label sensor in PSU\n";
- continue;
- }
-
- if (labelPaths.empty())
- {
+ std::cerr << "Failure reading " << sensorPath << "\n";
labelHead = sensorNameStr.substr(0, sensorNameStr.find("_"));
}
else
{
- auto labelPath =
- boost::replace_all_copy(sensorPathStr, "input", "label");
- std::ifstream labelFile(labelPath);
- if (!labelFile.good())
- {
- std::cerr << "Failure reading " << sensorPath << "\n";
- continue;
- }
std::string label;
std::getline(labelFile, label);
labelFile.close();
-
auto findSensor = sensors.find(label);
if (findSensor != sensors.end())
{