pldm: Optimized parsing of PDR JSON files
Move the generateStateEffecterRepo method of parse JSON to
pdr_state_effecter.hpp.
Tested with JSON files:
https://gist.github.com/lxwinspur/2c3fd68cdb35e06480c4a5f7890e3a06#file-effecter_pdr-json.
pldmtool platform GetPDR -d 1
Encode request successfully
Request Message:
08 01 80 02 51 01 00 00 00 00 00 00 00 01 80 00 00 00
Success in creating the socket : RC = 3
Success in connecting to socket : RC = 0
Success in sending message type as pldm to mctp : RC = 0
Write to socket successful : RC = 18
Total length:18
Loopback response message:
08 01 80 02 51 01 00 00 00 00 00 00 00 01 80 00 00 00
On first recv(),response == request : RC = 0
Total length: 46
Shutdown Socket successful : RC = 0
Response Message:
08 01 00 02 51 00 02 00 00 00 00 00 00 00 01 1d 00 01 00 00 00 01 0b 00 00 13 00 00 00 01 00 21 00 00 00 00 00 00 00 00 00 01 c4 00 01 06
Parsed Response Msg:
nextRecordHandle: 2
responseCount: 29
recordHandle: 1
PDRHeaderVersion: 1
PDRType: 11
recordChangeNumber: 0
dataLength: 19
PLDMTerminusHandle: 0
effecterID: 1
entityType: 33
entityInstanceNumber: 0
containerID: 0
effecterSemanticID: 0
effecterInit: 0
effecterDescriptionPDR: false
compositeEffecterCount: 1
stateSetID: 196
possibleStatesSize: 1
possibleStates: 6
Signed-off-by: George Liu <liuxiwei@inspur.com>
Change-Id: I8428ed042fb0a90ecc448073f059f66360066306
diff --git a/libpldmresponder/platform.hpp b/libpldmresponder/platform.hpp
index 9c8860e..75a1ad3 100644
--- a/libpldmresponder/platform.hpp
+++ b/libpldmresponder/platform.hpp
@@ -24,10 +24,13 @@
using namespace pldm::utils;
using namespace pldm::responder::pdr_utils;
+using generatePDR =
+ std::function<void(const Json& json, pdr_utils::RepoInterface& repo)>;
+
using EffecterId = uint16_t;
-using DbusMappings = std::vector<DBusMapping>;
-using DbusValMaps = std::vector<StatestoDbusVal>;
-using DbusObjMaps = std::map<EffecterId, std::tuple<DbusMappings, DbusValMaps>>;
+using DbusObjMaps =
+ std::map<EffecterId,
+ std::tuple<pdr_utils::DbusMappings, pdr_utils::DbusValMaps>>;
class Handler : public CmdHandler
{
@@ -60,17 +63,19 @@
* @param[in] dbusObj - list of D-Bus object structure and list of D-Bus
* property value to attribute value
*/
- void addDbusObjMaps(uint16_t effecterId,
- std::tuple<DbusMappings, DbusValMaps> dbusObj);
+ void addDbusObjMaps(
+ uint16_t effecterId,
+ std::tuple<pdr_utils::DbusMappings, pdr_utils::DbusValMaps> dbusObj);
/** @brief Retrieve an effecter id -> D-Bus objects mapping
*
* @param[in] effecterId - effecter id
*
- * @return std::tuple<DbusMappings, DbusValMaps> - list of D-Bus object
- * structure and list of D-Bus property value to attribute value
+ * @return std::tuple<pdr_utils::DbusMappings, pdr_utils::DbusValMaps> -
+ * list of D-Bus object structure and list of D-Bus property value
+ * to attribute value
*/
- const std::tuple<DbusMappings, DbusValMaps>&
+ const std::tuple<pdr_utils::DbusMappings, pdr_utils::DbusValMaps>&
getDbusObjMaps(uint16_t effecterId) const;
uint16_t getNextEffecterId()