diff options
Diffstat (limited to 'read_fru_data.cpp')
| -rw-r--r-- | read_fru_data.cpp | 77 |
1 files changed, 39 insertions, 38 deletions
diff --git a/read_fru_data.cpp b/read_fru_data.cpp index 5133612..4581a8c 100644 --- a/read_fru_data.cpp +++ b/read_fru_data.cpp @@ -1,11 +1,14 @@ -#include <map> -#include <phosphor-logging/elog-errors.hpp> -#include "xyz/openbmc_project/Common/error.hpp" #include "read_fru_data.hpp" + #include "fruread.hpp" -#include "host-ipmid/ipmid-api.h" -#include "utils.hpp" #include "types.hpp" +#include "utils.hpp" + +#include <map> +#include <phosphor-logging/elog-errors.hpp> +#include <xyz/openbmc_project/Common/error.hpp> + +#include "host-ipmid/ipmid-api.h" extern const FruMap frus; namespace ipmi @@ -14,22 +17,22 @@ namespace fru { using namespace phosphor::logging; using InternalFailure = - sdbusplus::xyz::openbmc_project::Common::Error::InternalFailure; + sdbusplus::xyz::openbmc_project::Common::Error::InternalFailure; std::unique_ptr<sdbusplus::bus::match_t> matchPtr(nullptr); -static constexpr auto INV_INTF = "xyz.openbmc_project.Inventory.Manager"; -static constexpr auto OBJ_PATH = "/xyz/openbmc_project/inventory"; +static constexpr auto INV_INTF = "xyz.openbmc_project.Inventory.Manager"; +static constexpr auto OBJ_PATH = "/xyz/openbmc_project/inventory"; static constexpr auto PROP_INTF = "org.freedesktop.DBus.Properties"; namespace cache { - //User initiate read FRU info area command followed by - //FRU read command. Also data is read in small chunks of - //the specified offset and count. - //Caching the data which will be invalidated when ever there - //is a change in FRU properties. - FRUAreaMap fruMap; -} +// User initiate read FRU info area command followed by +// FRU read command. Also data is read in small chunks of +// the specified offset and count. +// Caching the data which will be invalidated when ever there +// is a change in FRU properties. +FRUAreaMap fruMap; +} // namespace cache /** * @brief Read all the property value's for the specified interface * from Inventory. @@ -39,21 +42,19 @@ namespace cache * @return map of properties */ ipmi::PropertyMap readAllProperties(const std::string& intf, - const std::string& path) + const std::string& path) { ipmi::PropertyMap properties; sdbusplus::bus::bus bus{ipmid_get_sd_bus_connection()}; auto service = ipmi::getService(bus, INV_INTF, OBJ_PATH); std::string objPath = OBJ_PATH + path; - auto method = bus.new_method_call(service.c_str(), - objPath.c_str(), - PROP_INTF, - "GetAll"); + auto method = bus.new_method_call(service.c_str(), objPath.c_str(), + PROP_INTF, "GetAll"); method.append(intf); auto reply = bus.call(method); if (reply.is_method_error()) { - //If property is not found simply return empty value + // If property is not found simply return empty value log<level::ERR>("Error in reading property values from inventory", entry("INTERFACE=%s", intf.c_str()), entry("PATH=%s", objPath.c_str())); @@ -65,12 +66,12 @@ ipmi::PropertyMap readAllProperties(const std::string& intf, void processFruPropChange(sdbusplus::message::message& msg) { - if(cache::fruMap.empty()) + if (cache::fruMap.empty()) { return; } std::string path = msg.get_path(); - //trim the object base path, if found at the beginning + // trim the object base path, if found at the beginning if (path.compare(0, strlen(OBJ_PATH), OBJ_PATH) == 0) { path.erase(0, strlen(OBJ_PATH)); @@ -82,7 +83,7 @@ void processFruPropChange(sdbusplus::message::message& msg) auto& instanceList = fru.second; for (auto& instance : instanceList) { - if(instance.path == path) + if (instance.path == path) { found = true; break; @@ -96,19 +97,17 @@ void processFruPropChange(sdbusplus::message::message& msg) } } -//register for fru property change +// register for fru property change int registerCallbackHandler() { - if(matchPtr == nullptr) + if (matchPtr == nullptr) { using namespace sdbusplus::bus::match::rules; sdbusplus::bus::bus bus{ipmid_get_sd_bus_connection()}; matchPtr = std::make_unique<sdbusplus::bus::match_t>( bus, - path_namespace(OBJ_PATH) + - type::signal() + - member("PropertiesChanged") + - interface(PROP_INTF), + path_namespace(OBJ_PATH) + type::signal() + + member("PropertiesChanged") + interface(PROP_INTF), std::bind(processFruPropChange, std::placeholders::_1)); } return 0; @@ -125,7 +124,7 @@ FruInventoryData readDataFromInventory(const FRUId& fruNum) auto iter = frus.find(fruNum); if (iter == frus.end()) { - log<level::ERR>("Unsupported FRU ID ",entry("FRUID=%d", fruNum)); + log<level::ERR>("Unsupported FRU ID ", entry("FRUID=%d", fruNum)); elog<InternalFailure>(); } @@ -135,15 +134,17 @@ FruInventoryData readDataFromInventory(const FRUId& fruNum) { for (auto& intf : instance.interfaces) { - ipmi::PropertyMap allProp = readAllProperties( - intf.first, instance.path); + ipmi::PropertyMap allProp = + readAllProperties(intf.first, instance.path); for (auto& properties : intf.second) { auto iter = allProp.find(properties.first); if (iter != allProp.end()) { - data[properties.second.section].emplace(properties.first, - std::move(allProp[properties.first].get<std::string>())); + data[properties.second.section].emplace( + properties.first, + std::move( + allProp[properties.first].get<std::string>())); } } } @@ -160,10 +161,10 @@ const FruAreaData& getFruAreaData(const FRUId& fruNum) } auto invData = readDataFromInventory(fruNum); - //Build area info based on inventory data + // Build area info based on inventory data FruAreaData newdata = buildFruAreaData(std::move(invData)); cache::fruMap.emplace(fruNum, std::move(newdata)); return cache::fruMap.at(fruNum); } -} //fru -} //ipmi +} // namespace fru +} // namespace ipmi |
