James Feist | 6714a25 | 2018-09-10 15:26:18 -0700 | [diff] [blame] | 1 | /* |
| 2 | // Copyright (c) 2017 Intel Corporation |
| 3 | // |
| 4 | // Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | // you may not use this file except in compliance with the License. |
| 6 | // You may obtain a copy of the License at |
| 7 | // |
| 8 | // http://www.apache.org/licenses/LICENSE-2.0 |
| 9 | // |
| 10 | // Unless required by applicable law or agreed to in writing, software |
| 11 | // distributed under the License is distributed on an "AS IS" BASIS, |
| 12 | // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 13 | // See the License for the specific language governing permissions and |
| 14 | // limitations under the License. |
| 15 | */ |
| 16 | |
Andrew Jeffery | e73bd0a | 2023-01-25 10:39:57 +1030 | [diff] [blame] | 17 | #include "DeviceMgmt.hpp" |
| 18 | #include "HwmonTempSensor.hpp" |
Ed Tanous | eacbfdd | 2024-04-04 12:00:24 -0700 | [diff] [blame] | 19 | #include "SensorPaths.hpp" |
| 20 | #include "Thresholds.hpp" |
Andrew Jeffery | e73bd0a | 2023-01-25 10:39:57 +1030 | [diff] [blame] | 21 | #include "Utils.hpp" |
| 22 | |
Ed Tanous | eacbfdd | 2024-04-04 12:00:24 -0700 | [diff] [blame] | 23 | #include <boost/asio/error.hpp> |
| 24 | #include <boost/asio/io_context.hpp> |
| 25 | #include <boost/asio/post.hpp> |
| 26 | #include <boost/asio/steady_timer.hpp> |
Patrick Venture | 96e97db | 2019-10-31 13:44:38 -0700 | [diff] [blame] | 27 | #include <boost/container/flat_map.hpp> |
James Feist | 6714a25 | 2018-09-10 15:26:18 -0700 | [diff] [blame] | 28 | #include <boost/container/flat_set.hpp> |
James Feist | 38fb598 | 2020-05-28 10:09:54 -0700 | [diff] [blame] | 29 | #include <sdbusplus/asio/connection.hpp> |
| 30 | #include <sdbusplus/asio/object_server.hpp> |
Ed Tanous | eacbfdd | 2024-04-04 12:00:24 -0700 | [diff] [blame] | 31 | #include <sdbusplus/bus.hpp> |
James Feist | 38fb598 | 2020-05-28 10:09:54 -0700 | [diff] [blame] | 32 | #include <sdbusplus/bus/match.hpp> |
Ed Tanous | eacbfdd | 2024-04-04 12:00:24 -0700 | [diff] [blame] | 33 | #include <sdbusplus/message.hpp> |
| 34 | #include <sdbusplus/message/native_types.hpp> |
James Feist | 38fb598 | 2020-05-28 10:09:54 -0700 | [diff] [blame] | 35 | |
Ed Tanous | eacbfdd | 2024-04-04 12:00:24 -0700 | [diff] [blame] | 36 | #include <algorithm> |
James Feist | 38fb598 | 2020-05-28 10:09:54 -0700 | [diff] [blame] | 37 | #include <array> |
Ed Tanous | eacbfdd | 2024-04-04 12:00:24 -0700 | [diff] [blame] | 38 | #include <chrono> |
| 39 | #include <cstddef> |
| 40 | #include <cstdint> |
James Feist | 24f02f2 | 2019-04-15 11:05:39 -0700 | [diff] [blame] | 41 | #include <filesystem> |
Patrick Venture | 96e97db | 2019-10-31 13:44:38 -0700 | [diff] [blame] | 42 | #include <functional> |
Ed Tanous | eacbfdd | 2024-04-04 12:00:24 -0700 | [diff] [blame] | 43 | #include <ios> |
| 44 | #include <iostream> |
Patrick Venture | 96e97db | 2019-10-31 13:44:38 -0700 | [diff] [blame] | 45 | #include <memory> |
Ed Tanous | eacbfdd | 2024-04-04 12:00:24 -0700 | [diff] [blame] | 46 | #include <optional> |
James Feist | 6714a25 | 2018-09-10 15:26:18 -0700 | [diff] [blame] | 47 | #include <regex> |
Patrick Venture | 96e97db | 2019-10-31 13:44:38 -0700 | [diff] [blame] | 48 | #include <string> |
Ed Tanous | eacbfdd | 2024-04-04 12:00:24 -0700 | [diff] [blame] | 49 | #include <system_error> |
Patrick Venture | 96e97db | 2019-10-31 13:44:38 -0700 | [diff] [blame] | 50 | #include <utility> |
| 51 | #include <variant> |
| 52 | #include <vector> |
James Feist | 6714a25 | 2018-09-10 15:26:18 -0700 | [diff] [blame] | 53 | |
Jeff Lin | 87bc67f | 2020-12-04 20:58:01 +0800 | [diff] [blame] | 54 | static constexpr float pollRateDefault = 0.5; |
James Feist | 6714a25 | 2018-09-10 15:26:18 -0700 | [diff] [blame] | 55 | |
Zhikui Ren | cb359da | 2023-08-03 16:45:44 -0700 | [diff] [blame] | 56 | static constexpr double maxValuePressure = 120000; // Pascals |
| 57 | static constexpr double minValuePressure = 30000; // Pascals |
Bruce Mitchell | 544e7dc | 2021-07-29 18:05:49 -0500 | [diff] [blame] | 58 | |
Bruce Mitchell | 3ec41c5 | 2021-12-10 16:05:17 -0600 | [diff] [blame] | 59 | static constexpr double maxValueRelativeHumidity = 100; // PercentRH |
| 60 | static constexpr double minValueRelativeHumidity = 0; // PercentRH |
| 61 | |
Zhikui Ren | cb359da | 2023-08-03 16:45:44 -0700 | [diff] [blame] | 62 | static constexpr double maxValueTemperature = 127; // DegreesC |
| 63 | static constexpr double minValueTemperature = -128; // DegreesC |
Bruce Mitchell | 544e7dc | 2021-07-29 18:05:49 -0500 | [diff] [blame] | 64 | |
James Feist | cf3bce6 | 2019-01-08 10:07:19 -0800 | [diff] [blame] | 65 | namespace fs = std::filesystem; |
Zev Weiss | d29f8aa | 2022-08-03 16:24:59 -0700 | [diff] [blame] | 66 | |
| 67 | static const I2CDeviceTypeMap sensorTypes{ |
Patrick Rudolph | 76d3676 | 2023-09-20 16:53:38 +0200 | [diff] [blame] | 68 | {"ADM1021", I2CDeviceType{"adm1021", true}}, |
Zev Weiss | d29f8aa | 2022-08-03 16:24:59 -0700 | [diff] [blame] | 69 | {"DPS310", I2CDeviceType{"dps310", false}}, |
Delphine CC Chiu | 53896db | 2024-06-07 18:36:13 +0800 | [diff] [blame] | 70 | {"EMC1403", I2CDeviceType{"emc1403", true}}, |
Zev Weiss | d29f8aa | 2022-08-03 16:24:59 -0700 | [diff] [blame] | 71 | {"EMC1412", I2CDeviceType{"emc1412", true}}, |
| 72 | {"EMC1413", I2CDeviceType{"emc1413", true}}, |
| 73 | {"EMC1414", I2CDeviceType{"emc1414", true}}, |
| 74 | {"HDC1080", I2CDeviceType{"hdc1080", false}}, |
| 75 | {"JC42", I2CDeviceType{"jc42", true}}, |
| 76 | {"LM75A", I2CDeviceType{"lm75a", true}}, |
| 77 | {"LM95234", I2CDeviceType{"lm95234", true}}, |
| 78 | {"MAX31725", I2CDeviceType{"max31725", true}}, |
| 79 | {"MAX31730", I2CDeviceType{"max31730", true}}, |
| 80 | {"MAX6581", I2CDeviceType{"max6581", true}}, |
| 81 | {"MAX6654", I2CDeviceType{"max6654", true}}, |
Patrick Rudolph | f3862ee | 2023-10-23 14:13:06 +0200 | [diff] [blame] | 82 | {"MAX6639", I2CDeviceType{"max6639", true}}, |
Potin Lai | 28b8823 | 2023-12-13 16:41:01 +0800 | [diff] [blame] | 83 | {"MCP9600", I2CDeviceType{"mcp9600", false}}, |
Zev Weiss | d29f8aa | 2022-08-03 16:24:59 -0700 | [diff] [blame] | 84 | {"NCT6779", I2CDeviceType{"nct6779", true}}, |
| 85 | {"NCT7802", I2CDeviceType{"nct7802", true}}, |
Potin Lai | fb011cc | 2024-02-22 19:51:48 +0800 | [diff] [blame] | 86 | {"PT5161L", I2CDeviceType{"pt5161l", true}}, |
Zev Weiss | d29f8aa | 2022-08-03 16:24:59 -0700 | [diff] [blame] | 87 | {"SBTSI", I2CDeviceType{"sbtsi", true}}, |
| 88 | {"SI7020", I2CDeviceType{"si7020", false}}, |
Tim Lee | 9b0a6f6 | 2022-12-23 14:47:02 +0800 | [diff] [blame] | 89 | {"TMP100", I2CDeviceType{"tmp100", true}}, |
Zev Weiss | d29f8aa | 2022-08-03 16:24:59 -0700 | [diff] [blame] | 90 | {"TMP112", I2CDeviceType{"tmp112", true}}, |
| 91 | {"TMP175", I2CDeviceType{"tmp175", true}}, |
| 92 | {"TMP421", I2CDeviceType{"tmp421", true}}, |
| 93 | {"TMP441", I2CDeviceType{"tmp441", true}}, |
Khang Kieu | f4c3fad | 2023-11-27 22:39:01 +0000 | [diff] [blame] | 94 | {"TMP461", I2CDeviceType{"tmp461", true}}, |
Hieu Huynh | 9a7db6a | 2023-06-19 11:02:07 +0000 | [diff] [blame] | 95 | {"TMP464", I2CDeviceType{"tmp464", true}}, |
Zev Weiss | d29f8aa | 2022-08-03 16:24:59 -0700 | [diff] [blame] | 96 | {"TMP75", I2CDeviceType{"tmp75", true}}, |
| 97 | {"W83773G", I2CDeviceType{"w83773g", true}}, |
| 98 | }; |
James Feist | 6714a25 | 2018-09-10 15:26:18 -0700 | [diff] [blame] | 99 | |
Bruce Mitchell | 544e7dc | 2021-07-29 18:05:49 -0500 | [diff] [blame] | 100 | static struct SensorParams |
| 101 | getSensorParameters(const std::filesystem::path& path) |
| 102 | { |
| 103 | // offset is to default to 0 and scale to 1, see lore |
| 104 | // https://lore.kernel.org/linux-iio/5c79425f-6e88-36b6-cdfe-4080738d039f@metafoo.de/ |
Patrick Williams | 779c96a | 2023-05-10 07:50:42 -0500 | [diff] [blame] | 105 | struct SensorParams tmpSensorParameters = { |
| 106 | .minValue = minValueTemperature, |
| 107 | .maxValue = maxValueTemperature, |
| 108 | .offsetValue = 0.0, |
| 109 | .scaleValue = 1.0, |
| 110 | .units = sensor_paths::unitDegreesC, |
| 111 | .typeName = "temperature"}; |
Bruce Mitchell | 544e7dc | 2021-07-29 18:05:49 -0500 | [diff] [blame] | 112 | |
| 113 | // For IIO RAW sensors we get a raw_value, an offset, and scale |
| 114 | // to compute the value = (raw_value + offset) * scale |
| 115 | // with a _raw IIO device we need to get the |
| 116 | // offsetValue and scaleValue from the driver |
| 117 | // these are used to compute the reading in |
| 118 | // units that have yet to be scaled for D-Bus. |
| 119 | const std::string pathStr = path.string(); |
| 120 | if (pathStr.ends_with("_raw")) |
| 121 | { |
Patrick Williams | 779c96a | 2023-05-10 07:50:42 -0500 | [diff] [blame] | 122 | std::string pathOffsetStr = pathStr.substr(0, pathStr.size() - 4) + |
| 123 | "_offset"; |
Bruce Mitchell | 544e7dc | 2021-07-29 18:05:49 -0500 | [diff] [blame] | 124 | std::optional<double> tmpOffsetValue = readFile(pathOffsetStr, 1.0); |
| 125 | // In case there is nothing to read skip this device |
| 126 | // This is not an error condition see lore |
| 127 | // https://lore.kernel.org/linux-iio/5c79425f-6e88-36b6-cdfe-4080738d039f@metafoo.de/ |
| 128 | if (tmpOffsetValue) |
| 129 | { |
| 130 | tmpSensorParameters.offsetValue = *tmpOffsetValue; |
| 131 | } |
| 132 | |
Patrick Williams | 779c96a | 2023-05-10 07:50:42 -0500 | [diff] [blame] | 133 | std::string pathScaleStr = pathStr.substr(0, pathStr.size() - 4) + |
| 134 | "_scale"; |
Bruce Mitchell | 544e7dc | 2021-07-29 18:05:49 -0500 | [diff] [blame] | 135 | std::optional<double> tmpScaleValue = readFile(pathScaleStr, 1.0); |
| 136 | // In case there is nothing to read skip this device |
| 137 | // This is not an error condition see lore |
| 138 | // https://lore.kernel.org/linux-iio/5c79425f-6e88-36b6-cdfe-4080738d039f@metafoo.de/ |
| 139 | if (tmpScaleValue) |
| 140 | { |
| 141 | tmpSensorParameters.scaleValue = *tmpScaleValue; |
| 142 | } |
| 143 | } |
| 144 | |
| 145 | // Temperatures are read in milli degrees Celsius, we need |
| 146 | // degrees Celsius. Pressures are read in kilopascal, we need |
| 147 | // Pascals. On D-Bus for Open BMC we use the International |
| 148 | // System of Units without prefixes. Links to the kernel |
| 149 | // documentation: |
| 150 | // https://www.kernel.org/doc/Documentation/hwmon/sysfs-interface |
| 151 | // https://www.kernel.org/doc/Documentation/ABI/testing/sysfs-bus-iio |
| 152 | if (path.filename() == "in_pressure_input" || |
| 153 | path.filename() == "in_pressure_raw") |
| 154 | { |
| 155 | tmpSensorParameters.minValue = minValuePressure; |
| 156 | tmpSensorParameters.maxValue = maxValuePressure; |
| 157 | // Pressures are read in kilopascal, we need Pascals. |
| 158 | tmpSensorParameters.scaleValue *= 1000.0; |
| 159 | tmpSensorParameters.typeName = "pressure"; |
Bruce Mitchell | 5a86e56 | 2021-12-10 12:26:22 -0600 | [diff] [blame] | 160 | tmpSensorParameters.units = sensor_paths::unitPascals; |
Bruce Mitchell | 544e7dc | 2021-07-29 18:05:49 -0500 | [diff] [blame] | 161 | } |
Bruce Mitchell | 3ec41c5 | 2021-12-10 16:05:17 -0600 | [diff] [blame] | 162 | else if (path.filename() == "in_humidityrelative_input" || |
| 163 | path.filename() == "in_humidityrelative_raw") |
| 164 | { |
| 165 | tmpSensorParameters.minValue = minValueRelativeHumidity; |
| 166 | tmpSensorParameters.maxValue = maxValueRelativeHumidity; |
| 167 | // Relative Humidity are read in milli-percent, we need percent. |
| 168 | tmpSensorParameters.scaleValue *= 0.001; |
| 169 | tmpSensorParameters.typeName = "humidity"; |
Potin Lai | a9c1bec | 2024-04-19 08:35:56 +0800 | [diff] [blame] | 170 | tmpSensorParameters.units = sensor_paths::unitPercentRH; |
Bruce Mitchell | 3ec41c5 | 2021-12-10 16:05:17 -0600 | [diff] [blame] | 171 | } |
Bruce Mitchell | 544e7dc | 2021-07-29 18:05:49 -0500 | [diff] [blame] | 172 | else |
| 173 | { |
| 174 | // Temperatures are read in milli degrees Celsius, |
| 175 | // we need degrees Celsius. |
| 176 | tmpSensorParameters.scaleValue *= 0.001; |
| 177 | } |
| 178 | |
| 179 | return tmpSensorParameters; |
| 180 | } |
| 181 | |
Jayashree Dhanapal | 9f3a74e | 2022-01-06 12:05:06 +0530 | [diff] [blame] | 182 | struct SensorConfigKey |
| 183 | { |
| 184 | uint64_t bus; |
| 185 | uint64_t addr; |
| 186 | bool operator<(const SensorConfigKey& other) const |
| 187 | { |
| 188 | if (bus != other.bus) |
| 189 | { |
| 190 | return bus < other.bus; |
| 191 | } |
| 192 | return addr < other.addr; |
| 193 | } |
| 194 | }; |
| 195 | |
| 196 | struct SensorConfig |
| 197 | { |
| 198 | std::string sensorPath; |
| 199 | SensorData sensorData; |
| 200 | std::string interface; |
| 201 | SensorBaseConfigMap config; |
| 202 | std::vector<std::string> name; |
| 203 | }; |
| 204 | |
| 205 | using SensorConfigMap = |
| 206 | boost::container::flat_map<SensorConfigKey, SensorConfig>; |
| 207 | |
| 208 | static SensorConfigMap |
| 209 | buildSensorConfigMap(const ManagedObjectType& sensorConfigs) |
| 210 | { |
| 211 | SensorConfigMap configMap; |
Zev Weiss | a180833 | 2022-08-12 18:21:01 -0700 | [diff] [blame] | 212 | for (const auto& [path, cfgData] : sensorConfigs) |
Jayashree Dhanapal | 9f3a74e | 2022-01-06 12:05:06 +0530 | [diff] [blame] | 213 | { |
Zev Weiss | a180833 | 2022-08-12 18:21:01 -0700 | [diff] [blame] | 214 | for (const auto& [intf, cfg] : cfgData) |
Jayashree Dhanapal | 9f3a74e | 2022-01-06 12:05:06 +0530 | [diff] [blame] | 215 | { |
Jayashree Dhanapal | 9f3a74e | 2022-01-06 12:05:06 +0530 | [diff] [blame] | 216 | auto busCfg = cfg.find("Bus"); |
| 217 | auto addrCfg = cfg.find("Address"); |
| 218 | if ((busCfg == cfg.end()) || (addrCfg == cfg.end())) |
| 219 | { |
Jayashree Dhanapal | 9f3a74e | 2022-01-06 12:05:06 +0530 | [diff] [blame] | 220 | continue; |
| 221 | } |
| 222 | |
Ed Tanous | 2049bd2 | 2022-07-09 07:20:26 -0700 | [diff] [blame] | 223 | if ((std::get_if<uint64_t>(&busCfg->second) == nullptr) || |
| 224 | (std::get_if<uint64_t>(&addrCfg->second) == nullptr)) |
Jayashree Dhanapal | 9f3a74e | 2022-01-06 12:05:06 +0530 | [diff] [blame] | 225 | { |
Zev Weiss | a180833 | 2022-08-12 18:21:01 -0700 | [diff] [blame] | 226 | std::cerr << path.str << " Bus or Address invalid\n"; |
Jayashree Dhanapal | 9f3a74e | 2022-01-06 12:05:06 +0530 | [diff] [blame] | 227 | continue; |
| 228 | } |
| 229 | |
| 230 | std::vector<std::string> hwmonNames; |
| 231 | auto nameCfg = cfg.find("Name"); |
| 232 | if (nameCfg != cfg.end()) |
| 233 | { |
| 234 | hwmonNames.push_back(std::get<std::string>(nameCfg->second)); |
| 235 | size_t i = 1; |
| 236 | while (true) |
| 237 | { |
| 238 | auto sensorNameCfg = cfg.find("Name" + std::to_string(i)); |
| 239 | if (sensorNameCfg == cfg.end()) |
| 240 | { |
| 241 | break; |
| 242 | } |
| 243 | hwmonNames.push_back( |
| 244 | std::get<std::string>(sensorNameCfg->second)); |
| 245 | i++; |
| 246 | } |
| 247 | } |
| 248 | |
| 249 | SensorConfigKey key = {std::get<uint64_t>(busCfg->second), |
| 250 | std::get<uint64_t>(addrCfg->second)}; |
Zev Weiss | a180833 | 2022-08-12 18:21:01 -0700 | [diff] [blame] | 251 | SensorConfig val = {path.str, cfgData, intf, cfg, hwmonNames}; |
Jayashree Dhanapal | 9f3a74e | 2022-01-06 12:05:06 +0530 | [diff] [blame] | 252 | |
| 253 | auto [it, inserted] = configMap.emplace(key, std::move(val)); |
| 254 | if (!inserted) |
| 255 | { |
Zev Weiss | a180833 | 2022-08-12 18:21:01 -0700 | [diff] [blame] | 256 | std::cerr << path.str << ": ignoring duplicate entry for {" |
| 257 | << key.bus << ", 0x" << std::hex << key.addr |
| 258 | << std::dec << "}\n"; |
Jayashree Dhanapal | 9f3a74e | 2022-01-06 12:05:06 +0530 | [diff] [blame] | 259 | } |
| 260 | } |
| 261 | } |
| 262 | return configMap; |
| 263 | } |
| 264 | |
James Feist | 6714a25 | 2018-09-10 15:26:18 -0700 | [diff] [blame] | 265 | void createSensors( |
Ed Tanous | 1f97863 | 2023-02-28 18:16:39 -0800 | [diff] [blame] | 266 | boost::asio::io_context& io, sdbusplus::asio::object_server& objectServer, |
Yong Li | f3fd191 | 2020-03-25 21:35:23 +0800 | [diff] [blame] | 267 | boost::container::flat_map<std::string, std::shared_ptr<HwmonTempSensor>>& |
James Feist | 6714a25 | 2018-09-10 15:26:18 -0700 | [diff] [blame] | 268 | sensors, |
| 269 | std::shared_ptr<sdbusplus::asio::connection>& dbusConnection, |
James Feist | 5591cf08 | 2020-07-15 16:44:54 -0700 | [diff] [blame] | 270 | const std::shared_ptr<boost::container::flat_set<std::string>>& |
Zev Weiss | a1456c4 | 2022-07-18 16:59:35 -0700 | [diff] [blame] | 271 | sensorsChanged, |
| 272 | bool activateOnly) |
James Feist | 6714a25 | 2018-09-10 15:26:18 -0700 | [diff] [blame] | 273 | { |
James Feist | df51515 | 2019-09-18 16:40:40 -0700 | [diff] [blame] | 274 | auto getter = std::make_shared<GetSensorConfiguration>( |
| 275 | dbusConnection, |
Zev Weiss | a1456c4 | 2022-07-18 16:59:35 -0700 | [diff] [blame] | 276 | [&io, &objectServer, &sensors, &dbusConnection, sensorsChanged, |
| 277 | activateOnly](const ManagedObjectType& sensorConfigurations) { |
Ed Tanous | bb67932 | 2022-05-16 16:10:00 -0700 | [diff] [blame] | 278 | bool firstScan = sensorsChanged == nullptr; |
James Feist | 6714a25 | 2018-09-10 15:26:18 -0700 | [diff] [blame] | 279 | |
Ed Tanous | bb67932 | 2022-05-16 16:10:00 -0700 | [diff] [blame] | 280 | SensorConfigMap configMap = buildSensorConfigMap(sensorConfigurations); |
Jayashree Dhanapal | 9f3a74e | 2022-01-06 12:05:06 +0530 | [diff] [blame] | 281 | |
Matt Simmering | c564eda | 2023-05-12 13:04:43 -0700 | [diff] [blame] | 282 | auto devices = instantiateDevices(sensorConfigurations, sensors, |
| 283 | sensorTypes); |
Zev Weiss | a1456c4 | 2022-07-18 16:59:35 -0700 | [diff] [blame] | 284 | |
Ed Tanous | bb67932 | 2022-05-16 16:10:00 -0700 | [diff] [blame] | 285 | // IIO _raw devices look like this on sysfs: |
| 286 | // /sys/bus/iio/devices/iio:device0/in_temp_raw |
| 287 | // /sys/bus/iio/devices/iio:device0/in_temp_offset |
| 288 | // /sys/bus/iio/devices/iio:device0/in_temp_scale |
| 289 | // |
| 290 | // Other IIO devices look like this on sysfs: |
| 291 | // /sys/bus/iio/devices/iio:device1/in_temp_input |
| 292 | // /sys/bus/iio/devices/iio:device1/in_pressure_input |
| 293 | std::vector<fs::path> paths; |
| 294 | fs::path root("/sys/bus/iio/devices"); |
| 295 | findFiles(root, R"(in_temp\d*_(input|raw))", paths); |
| 296 | findFiles(root, R"(in_pressure\d*_(input|raw))", paths); |
| 297 | findFiles(root, R"(in_humidityrelative\d*_(input|raw))", paths); |
| 298 | findFiles(fs::path("/sys/class/hwmon"), R"(temp\d+_input)", paths); |
Bruce Mitchell | 544e7dc | 2021-07-29 18:05:49 -0500 | [diff] [blame] | 299 | |
Ed Tanous | bb67932 | 2022-05-16 16:10:00 -0700 | [diff] [blame] | 300 | // iterate through all found temp and pressure sensors, |
| 301 | // and try to match them with configuration |
| 302 | for (auto& path : paths) |
| 303 | { |
| 304 | std::smatch match; |
| 305 | const std::string pathStr = path.string(); |
| 306 | auto directory = path.parent_path(); |
| 307 | fs::path device; |
| 308 | |
| 309 | std::string deviceName; |
Zhikui Ren | ae46396 | 2024-01-02 15:35:31 -0800 | [diff] [blame] | 310 | std::error_code ec; |
Ed Tanous | bb67932 | 2022-05-16 16:10:00 -0700 | [diff] [blame] | 311 | if (pathStr.starts_with("/sys/bus/iio/devices")) |
James Feist | 37266ca | 2018-10-15 15:56:28 -0700 | [diff] [blame] | 312 | { |
Zhikui Ren | ae46396 | 2024-01-02 15:35:31 -0800 | [diff] [blame] | 313 | device = fs::canonical(directory, ec); |
| 314 | if (ec) |
| 315 | { |
| 316 | std::cerr << "Fail to find device in path [" << pathStr |
| 317 | << "]\n"; |
| 318 | continue; |
| 319 | } |
Ed Tanous | bb67932 | 2022-05-16 16:10:00 -0700 | [diff] [blame] | 320 | deviceName = device.parent_path().stem(); |
| 321 | } |
| 322 | else |
| 323 | { |
Zhikui Ren | ae46396 | 2024-01-02 15:35:31 -0800 | [diff] [blame] | 324 | device = fs::canonical(directory / "device", ec); |
| 325 | if (ec) |
| 326 | { |
| 327 | std::cerr << "Fail to find device in path [" << pathStr |
| 328 | << "]\n"; |
| 329 | continue; |
| 330 | } |
| 331 | deviceName = device.stem(); |
Ed Tanous | bb67932 | 2022-05-16 16:10:00 -0700 | [diff] [blame] | 332 | } |
Ed Tanous | bb67932 | 2022-05-16 16:10:00 -0700 | [diff] [blame] | 333 | |
Tom Tung | 278e177 | 2023-12-12 09:20:40 +0800 | [diff] [blame] | 334 | uint64_t bus = 0; |
| 335 | uint64_t addr = 0; |
Akshit Shah | 03d333e | 2023-08-23 22:14:28 +0000 | [diff] [blame] | 336 | if (!getDeviceBusAddr(deviceName, bus, addr)) |
Ed Tanous | bb67932 | 2022-05-16 16:10:00 -0700 | [diff] [blame] | 337 | { |
| 338 | continue; |
James Feist | df51515 | 2019-09-18 16:40:40 -0700 | [diff] [blame] | 339 | } |
| 340 | |
Ed Tanous | bb67932 | 2022-05-16 16:10:00 -0700 | [diff] [blame] | 341 | auto thisSensorParameters = getSensorParameters(path); |
| 342 | auto findSensorCfg = configMap.find({bus, addr}); |
| 343 | if (findSensorCfg == configMap.end()) |
James Feist | df51515 | 2019-09-18 16:40:40 -0700 | [diff] [blame] | 344 | { |
Ed Tanous | bb67932 | 2022-05-16 16:10:00 -0700 | [diff] [blame] | 345 | continue; |
| 346 | } |
James Feist | df51515 | 2019-09-18 16:40:40 -0700 | [diff] [blame] | 347 | |
Ed Tanous | bb67932 | 2022-05-16 16:10:00 -0700 | [diff] [blame] | 348 | const std::string& interfacePath = findSensorCfg->second.sensorPath; |
Zev Weiss | 7627c86 | 2022-11-17 14:23:04 -0800 | [diff] [blame] | 349 | auto findI2CDev = devices.find(interfacePath); |
| 350 | |
Zev Weiss | a1456c4 | 2022-07-18 16:59:35 -0700 | [diff] [blame] | 351 | std::shared_ptr<I2CDevice> i2cDev; |
Zev Weiss | 7627c86 | 2022-11-17 14:23:04 -0800 | [diff] [blame] | 352 | if (findI2CDev != devices.end()) |
Zev Weiss | a1456c4 | 2022-07-18 16:59:35 -0700 | [diff] [blame] | 353 | { |
Joseph Fu | 9bbeff7 | 2022-12-05 19:09:16 +0800 | [diff] [blame] | 354 | // If we're only looking to activate newly-instantiated i2c |
| 355 | // devices and this sensor's underlying device was already there |
| 356 | // before this call, there's nothing more to do here. |
| 357 | if (activateOnly && !findI2CDev->second.second) |
| 358 | { |
| 359 | continue; |
| 360 | } |
Zev Weiss | 7627c86 | 2022-11-17 14:23:04 -0800 | [diff] [blame] | 361 | i2cDev = findI2CDev->second.first; |
Zev Weiss | a1456c4 | 2022-07-18 16:59:35 -0700 | [diff] [blame] | 362 | } |
| 363 | |
Ed Tanous | bb67932 | 2022-05-16 16:10:00 -0700 | [diff] [blame] | 364 | const SensorData& sensorData = findSensorCfg->second.sensorData; |
Matt Spinler | 0489ec2 | 2023-06-05 15:08:59 -0500 | [diff] [blame] | 365 | std::string sensorType = findSensorCfg->second.interface; |
| 366 | auto pos = sensorType.find_last_of('.'); |
| 367 | if (pos != std::string::npos) |
| 368 | { |
| 369 | sensorType = sensorType.substr(pos + 1); |
| 370 | } |
Ed Tanous | bb67932 | 2022-05-16 16:10:00 -0700 | [diff] [blame] | 371 | const SensorBaseConfigMap& baseConfigMap = |
| 372 | findSensorCfg->second.config; |
| 373 | std::vector<std::string>& hwmonName = findSensorCfg->second.name; |
| 374 | |
| 375 | // Temperature has "Name", pressure has "Name1" |
| 376 | auto findSensorName = baseConfigMap.find("Name"); |
| 377 | int index = 1; |
| 378 | if (thisSensorParameters.typeName == "pressure" || |
| 379 | thisSensorParameters.typeName == "humidity") |
| 380 | { |
| 381 | findSensorName = baseConfigMap.find("Name1"); |
| 382 | index = 2; |
| 383 | } |
| 384 | |
| 385 | if (findSensorName == baseConfigMap.end()) |
| 386 | { |
| 387 | std::cerr << "could not determine configuration name for " |
| 388 | << deviceName << "\n"; |
| 389 | continue; |
| 390 | } |
| 391 | std::string sensorName = |
| 392 | std::get<std::string>(findSensorName->second); |
| 393 | // on rescans, only update sensors we were signaled by |
| 394 | auto findSensor = sensors.find(sensorName); |
| 395 | if (!firstScan && findSensor != sensors.end()) |
| 396 | { |
| 397 | bool found = false; |
| 398 | auto it = sensorsChanged->begin(); |
| 399 | while (it != sensorsChanged->end()) |
| 400 | { |
Zev Weiss | 6c106d6 | 2022-08-17 20:50:00 -0700 | [diff] [blame] | 401 | if (it->ends_with(findSensor->second->name)) |
Ed Tanous | bb67932 | 2022-05-16 16:10:00 -0700 | [diff] [blame] | 402 | { |
| 403 | it = sensorsChanged->erase(it); |
| 404 | findSensor->second = nullptr; |
| 405 | found = true; |
| 406 | break; |
| 407 | } |
| 408 | ++it; |
| 409 | } |
| 410 | if (!found) |
| 411 | { |
| 412 | continue; |
| 413 | } |
| 414 | } |
| 415 | |
| 416 | std::vector<thresholds::Threshold> sensorThresholds; |
| 417 | |
| 418 | if (!parseThresholdsFromConfig(sensorData, sensorThresholds, |
| 419 | nullptr, &index)) |
| 420 | { |
| 421 | std::cerr << "error populating thresholds for " << sensorName |
| 422 | << " index " << index << "\n"; |
| 423 | } |
| 424 | |
Zev Weiss | 8569bf2 | 2022-10-11 15:37:44 -0700 | [diff] [blame] | 425 | float pollRate = getPollRate(baseConfigMap, pollRateDefault); |
Zev Weiss | a4d2768 | 2022-07-19 15:30:36 -0700 | [diff] [blame] | 426 | PowerState readState = getPowerState(baseConfigMap); |
Ed Tanous | bb67932 | 2022-05-16 16:10:00 -0700 | [diff] [blame] | 427 | |
| 428 | auto permitSet = getPermitSet(baseConfigMap); |
| 429 | auto& sensor = sensors[sensorName]; |
Zev Weiss | a1456c4 | 2022-07-18 16:59:35 -0700 | [diff] [blame] | 430 | if (!activateOnly) |
| 431 | { |
| 432 | sensor = nullptr; |
| 433 | } |
Patrick Williams | 779c96a | 2023-05-10 07:50:42 -0500 | [diff] [blame] | 434 | auto hwmonFile = getFullHwmonFilePath(directory.string(), "temp1", |
| 435 | permitSet); |
Ed Tanous | bb67932 | 2022-05-16 16:10:00 -0700 | [diff] [blame] | 436 | if (pathStr.starts_with("/sys/bus/iio/devices")) |
| 437 | { |
| 438 | hwmonFile = pathStr; |
| 439 | } |
| 440 | if (hwmonFile) |
| 441 | { |
Zev Weiss | a1456c4 | 2022-07-18 16:59:35 -0700 | [diff] [blame] | 442 | if (sensor != nullptr) |
| 443 | { |
| 444 | sensor->activate(*hwmonFile, i2cDev); |
| 445 | } |
| 446 | else |
| 447 | { |
| 448 | sensor = std::make_shared<HwmonTempSensor>( |
| 449 | *hwmonFile, sensorType, objectServer, dbusConnection, |
| 450 | io, sensorName, std::move(sensorThresholds), |
| 451 | thisSensorParameters, pollRate, interfacePath, |
| 452 | readState, i2cDev); |
| 453 | sensor->setupRead(); |
| 454 | } |
Ed Tanous | bb67932 | 2022-05-16 16:10:00 -0700 | [diff] [blame] | 455 | } |
| 456 | hwmonName.erase( |
| 457 | remove(hwmonName.begin(), hwmonName.end(), sensorName), |
| 458 | hwmonName.end()); |
| 459 | |
| 460 | // Looking for keys like "Name1" for temp2_input, |
| 461 | // "Name2" for temp3_input, etc. |
| 462 | int i = 0; |
| 463 | while (true) |
| 464 | { |
| 465 | ++i; |
| 466 | auto findKey = baseConfigMap.find("Name" + std::to_string(i)); |
| 467 | if (findKey == baseConfigMap.end()) |
| 468 | { |
| 469 | break; |
| 470 | } |
| 471 | std::string sensorName = std::get<std::string>(findKey->second); |
| 472 | hwmonFile = getFullHwmonFilePath(directory.string(), |
| 473 | "temp" + std::to_string(i + 1), |
| 474 | permitSet); |
Bruce Mitchell | 544e7dc | 2021-07-29 18:05:49 -0500 | [diff] [blame] | 475 | if (pathStr.starts_with("/sys/bus/iio/devices")) |
James Feist | 37266ca | 2018-10-15 15:56:28 -0700 | [diff] [blame] | 476 | { |
James Feist | df51515 | 2019-09-18 16:40:40 -0700 | [diff] [blame] | 477 | continue; |
| 478 | } |
Jason Ling | 100c20b | 2020-08-11 14:50:33 -0700 | [diff] [blame] | 479 | if (hwmonFile) |
| 480 | { |
Ed Tanous | bb67932 | 2022-05-16 16:10:00 -0700 | [diff] [blame] | 481 | // To look up thresholds for these additional sensors, |
| 482 | // match on the Index property in the threshold data |
| 483 | // where the index comes from the sysfs file we're on, |
| 484 | // i.e. index = 2 for temp2_input. |
| 485 | int index = i + 1; |
| 486 | std::vector<thresholds::Threshold> thresholds; |
| 487 | |
| 488 | if (!parseThresholdsFromConfig(sensorData, thresholds, |
| 489 | nullptr, &index)) |
| 490 | { |
| 491 | std::cerr << "error populating thresholds for " |
| 492 | << sensorName << " index " << index << "\n"; |
| 493 | } |
| 494 | |
| 495 | auto& sensor = sensors[sensorName]; |
Zev Weiss | a1456c4 | 2022-07-18 16:59:35 -0700 | [diff] [blame] | 496 | if (!activateOnly) |
| 497 | { |
| 498 | sensor = nullptr; |
| 499 | } |
| 500 | |
| 501 | if (sensor != nullptr) |
| 502 | { |
| 503 | sensor->activate(*hwmonFile, i2cDev); |
| 504 | } |
| 505 | else |
| 506 | { |
| 507 | sensor = std::make_shared<HwmonTempSensor>( |
| 508 | *hwmonFile, sensorType, objectServer, |
| 509 | dbusConnection, io, sensorName, |
| 510 | std::move(thresholds), thisSensorParameters, |
| 511 | pollRate, interfacePath, readState, i2cDev); |
| 512 | sensor->setupRead(); |
| 513 | } |
Jason Ling | 100c20b | 2020-08-11 14:50:33 -0700 | [diff] [blame] | 514 | } |
Ed Tanous | bb67932 | 2022-05-16 16:10:00 -0700 | [diff] [blame] | 515 | |
Willy Tu | 9eb0cc3 | 2022-04-06 11:03:32 -0700 | [diff] [blame] | 516 | hwmonName.erase( |
| 517 | remove(hwmonName.begin(), hwmonName.end(), sensorName), |
| 518 | hwmonName.end()); |
James Feist | df51515 | 2019-09-18 16:40:40 -0700 | [diff] [blame] | 519 | } |
Ed Tanous | bb67932 | 2022-05-16 16:10:00 -0700 | [diff] [blame] | 520 | if (hwmonName.empty()) |
| 521 | { |
| 522 | configMap.erase(findSensorCfg); |
| 523 | } |
| 524 | } |
Patrick Williams | 597e842 | 2023-10-20 11:19:01 -0500 | [diff] [blame] | 525 | }); |
Zev Weiss | d29f8aa | 2022-08-03 16:24:59 -0700 | [diff] [blame] | 526 | std::vector<std::string> types(sensorTypes.size()); |
| 527 | for (const auto& [type, dt] : sensorTypes) |
| 528 | { |
| 529 | types.push_back(type); |
| 530 | } |
| 531 | getter->getConfiguration(types); |
James Feist | 6714a25 | 2018-09-10 15:26:18 -0700 | [diff] [blame] | 532 | } |
| 533 | |
Matt Spinler | 20bf2c1 | 2021-09-14 11:07:07 -0500 | [diff] [blame] | 534 | void interfaceRemoved( |
Patrick Williams | 92f8f51 | 2022-07-22 19:26:55 -0500 | [diff] [blame] | 535 | sdbusplus::message_t& message, |
Matt Spinler | 20bf2c1 | 2021-09-14 11:07:07 -0500 | [diff] [blame] | 536 | boost::container::flat_map<std::string, std::shared_ptr<HwmonTempSensor>>& |
| 537 | sensors) |
| 538 | { |
| 539 | if (message.is_method_error()) |
| 540 | { |
| 541 | std::cerr << "interfacesRemoved callback method error\n"; |
| 542 | return; |
| 543 | } |
| 544 | |
| 545 | sdbusplus::message::object_path path; |
| 546 | std::vector<std::string> interfaces; |
| 547 | |
| 548 | message.read(path, interfaces); |
| 549 | |
| 550 | // If the xyz.openbmc_project.Confguration.X interface was removed |
| 551 | // for one or more sensors, delete those sensor objects. |
| 552 | auto sensorIt = sensors.begin(); |
| 553 | while (sensorIt != sensors.end()) |
| 554 | { |
Patrick Rudolph | 6289f5a | 2023-09-22 11:32:54 +0200 | [diff] [blame] | 555 | if (sensorIt->second && (sensorIt->second->configurationPath == path) && |
Matt Spinler | 20bf2c1 | 2021-09-14 11:07:07 -0500 | [diff] [blame] | 556 | (std::find(interfaces.begin(), interfaces.end(), |
Matt Spinler | 55832f3 | 2023-06-07 10:24:00 -0500 | [diff] [blame] | 557 | sensorIt->second->configInterface) != interfaces.end())) |
Matt Spinler | 20bf2c1 | 2021-09-14 11:07:07 -0500 | [diff] [blame] | 558 | { |
| 559 | sensorIt = sensors.erase(sensorIt); |
| 560 | } |
| 561 | else |
| 562 | { |
| 563 | sensorIt++; |
| 564 | } |
| 565 | } |
| 566 | } |
| 567 | |
Zev Weiss | a1456c4 | 2022-07-18 16:59:35 -0700 | [diff] [blame] | 568 | static void powerStateChanged( |
| 569 | PowerState type, bool newState, |
| 570 | boost::container::flat_map<std::string, std::shared_ptr<HwmonTempSensor>>& |
| 571 | sensors, |
Ed Tanous | 1f97863 | 2023-02-28 18:16:39 -0800 | [diff] [blame] | 572 | boost::asio::io_context& io, sdbusplus::asio::object_server& objectServer, |
Zev Weiss | a1456c4 | 2022-07-18 16:59:35 -0700 | [diff] [blame] | 573 | std::shared_ptr<sdbusplus::asio::connection>& dbusConnection) |
| 574 | { |
| 575 | if (newState) |
| 576 | { |
| 577 | createSensors(io, objectServer, sensors, dbusConnection, nullptr, true); |
| 578 | } |
| 579 | else |
| 580 | { |
| 581 | for (auto& [path, sensor] : sensors) |
| 582 | { |
| 583 | if (sensor != nullptr && sensor->readState == type) |
| 584 | { |
| 585 | sensor->deactivate(); |
| 586 | } |
| 587 | } |
| 588 | } |
| 589 | } |
| 590 | |
James Feist | b6c0b91 | 2019-07-09 12:21:44 -0700 | [diff] [blame] | 591 | int main() |
James Feist | 6714a25 | 2018-09-10 15:26:18 -0700 | [diff] [blame] | 592 | { |
Ed Tanous | 1f97863 | 2023-02-28 18:16:39 -0800 | [diff] [blame] | 593 | boost::asio::io_context io; |
James Feist | 6714a25 | 2018-09-10 15:26:18 -0700 | [diff] [blame] | 594 | auto systemBus = std::make_shared<sdbusplus::asio::connection>(io); |
Ed Tanous | 14ed5e9 | 2022-07-12 15:50:23 -0700 | [diff] [blame] | 595 | sdbusplus::asio::object_server objectServer(systemBus, true); |
| 596 | objectServer.add_manager("/xyz/openbmc_project/sensors"); |
James Feist | 6714a25 | 2018-09-10 15:26:18 -0700 | [diff] [blame] | 597 | systemBus->request_name("xyz.openbmc_project.HwmonTempSensor"); |
Ed Tanous | 14ed5e9 | 2022-07-12 15:50:23 -0700 | [diff] [blame] | 598 | |
Yong Li | f3fd191 | 2020-03-25 21:35:23 +0800 | [diff] [blame] | 599 | boost::container::flat_map<std::string, std::shared_ptr<HwmonTempSensor>> |
James Feist | 6714a25 | 2018-09-10 15:26:18 -0700 | [diff] [blame] | 600 | sensors; |
James Feist | 5591cf08 | 2020-07-15 16:44:54 -0700 | [diff] [blame] | 601 | auto sensorsChanged = |
| 602 | std::make_shared<boost::container::flat_set<std::string>>(); |
James Feist | 6714a25 | 2018-09-10 15:26:18 -0700 | [diff] [blame] | 603 | |
Zev Weiss | a1456c4 | 2022-07-18 16:59:35 -0700 | [diff] [blame] | 604 | auto powerCallBack = [&sensors, &io, &objectServer, |
| 605 | &systemBus](PowerState type, bool state) { |
| 606 | powerStateChanged(type, state, sensors, io, objectServer, systemBus); |
| 607 | }; |
| 608 | setupPowerMatchCallback(systemBus, powerCallBack); |
| 609 | |
Ed Tanous | 83db50c | 2023-03-01 10:20:24 -0800 | [diff] [blame] | 610 | boost::asio::post(io, [&]() { |
Zev Weiss | a1456c4 | 2022-07-18 16:59:35 -0700 | [diff] [blame] | 611 | createSensors(io, objectServer, sensors, systemBus, nullptr, false); |
James Feist | 6714a25 | 2018-09-10 15:26:18 -0700 | [diff] [blame] | 612 | }); |
| 613 | |
Ed Tanous | 9b4a20e | 2022-09-06 08:47:11 -0700 | [diff] [blame] | 614 | boost::asio::steady_timer filterTimer(io); |
Patrick Williams | 92f8f51 | 2022-07-22 19:26:55 -0500 | [diff] [blame] | 615 | std::function<void(sdbusplus::message_t&)> eventHandler = |
| 616 | [&](sdbusplus::message_t& message) { |
Ed Tanous | bb67932 | 2022-05-16 16:10:00 -0700 | [diff] [blame] | 617 | if (message.is_method_error()) |
| 618 | { |
| 619 | std::cerr << "callback method error\n"; |
| 620 | return; |
| 621 | } |
| 622 | sensorsChanged->insert(message.get_path()); |
| 623 | // this implicitly cancels the timer |
Ed Tanous | 83db50c | 2023-03-01 10:20:24 -0800 | [diff] [blame] | 624 | filterTimer.expires_after(std::chrono::seconds(1)); |
Ed Tanous | bb67932 | 2022-05-16 16:10:00 -0700 | [diff] [blame] | 625 | |
| 626 | filterTimer.async_wait([&](const boost::system::error_code& ec) { |
| 627 | if (ec == boost::asio::error::operation_aborted) |
James Feist | 6714a25 | 2018-09-10 15:26:18 -0700 | [diff] [blame] | 628 | { |
Ed Tanous | bb67932 | 2022-05-16 16:10:00 -0700 | [diff] [blame] | 629 | /* we were canceled*/ |
James Feist | 6714a25 | 2018-09-10 15:26:18 -0700 | [diff] [blame] | 630 | return; |
| 631 | } |
Ed Tanous | bb67932 | 2022-05-16 16:10:00 -0700 | [diff] [blame] | 632 | if (ec) |
| 633 | { |
| 634 | std::cerr << "timer error\n"; |
| 635 | return; |
| 636 | } |
Zev Weiss | a1456c4 | 2022-07-18 16:59:35 -0700 | [diff] [blame] | 637 | createSensors(io, objectServer, sensors, systemBus, sensorsChanged, |
| 638 | false); |
Ed Tanous | bb67932 | 2022-05-16 16:10:00 -0700 | [diff] [blame] | 639 | }); |
| 640 | }; |
James Feist | 6714a25 | 2018-09-10 15:26:18 -0700 | [diff] [blame] | 641 | |
Zev Weiss | 214d971 | 2022-08-12 12:54:31 -0700 | [diff] [blame] | 642 | std::vector<std::unique_ptr<sdbusplus::bus::match_t>> matches = |
| 643 | setupPropertiesChangedMatches(*systemBus, sensorTypes, eventHandler); |
Bruce Lee | 1263c3d | 2021-06-04 15:16:33 +0800 | [diff] [blame] | 644 | setupManufacturingModeMatch(*systemBus); |
Matt Spinler | 20bf2c1 | 2021-09-14 11:07:07 -0500 | [diff] [blame] | 645 | |
| 646 | // Watch for entity-manager to remove configuration interfaces |
| 647 | // so the corresponding sensors can be removed. |
Patrick Williams | 92f8f51 | 2022-07-22 19:26:55 -0500 | [diff] [blame] | 648 | auto ifaceRemovedMatch = std::make_unique<sdbusplus::bus::match_t>( |
| 649 | static_cast<sdbusplus::bus_t&>(*systemBus), |
Matt Spinler | 20bf2c1 | 2021-09-14 11:07:07 -0500 | [diff] [blame] | 650 | "type='signal',member='InterfacesRemoved',arg0path='" + |
| 651 | std::string(inventoryPath) + "/'", |
Patrick Williams | 92f8f51 | 2022-07-22 19:26:55 -0500 | [diff] [blame] | 652 | [&sensors](sdbusplus::message_t& msg) { |
Ed Tanous | bb67932 | 2022-05-16 16:10:00 -0700 | [diff] [blame] | 653 | interfaceRemoved(msg, sensors); |
Patrick Williams | 597e842 | 2023-10-20 11:19:01 -0500 | [diff] [blame] | 654 | }); |
Matt Spinler | 20bf2c1 | 2021-09-14 11:07:07 -0500 | [diff] [blame] | 655 | |
| 656 | matches.emplace_back(std::move(ifaceRemovedMatch)); |
| 657 | |
James Feist | 6714a25 | 2018-09-10 15:26:18 -0700 | [diff] [blame] | 658 | io.run(); |
| 659 | } |