commit e5268cda7389820cfc76142218dd149c76c59fe6
author Tom Joseph <rushtotom@gmail.com> Tue Sep 07 13:04:03 2021 +0530
committer Tom Joseph <rushtotom@gmail.com> Mon Sep 13 05:59:55 2021 +0000
tree 9a3fa59af3fb4816a35cee7d3bc62d893ec700f6
parent 430aaee5013789862de586473b43d2191d492a41

Refactor the verbose tracing in PLDM

1. Add verbose tracing in requester code
2. Change the prefix of verbose tracing to "Tx: " and "Rx: "
3. Remove explicit verbose tracing flag in libpldmresponder
4. Change the prefix of pldmtool verbose tracing to "pldmtool: Tx: "
   and "pldmtool: Rx: "

Signed-off-by: Tom Joseph <rushtotom@gmail.com>
Change-Id: Ie2c6b323e32e0828ed5ecaeb3e61943a98a2f089

host-bmc/dbus_to_host_effecters.cpp

diff --git a/host-bmc/dbus_to_host_effecters.cpp b/host-bmc/dbus_to_host_effecters.cpp
index 2ed96c0..2486c64 100644
--- a/host-bmc/dbus_to_host_effecters.cpp
+++ b/host-bmc/dbus_to_host_effecters.cpp
@@ -269,19 +269,6 @@
         return rc;
     }
 
-    if (verbose)
-    {
-        if (requestMsg.size())
-        {
-            std::ostringstream tempStream;
-            for (int byte : requestMsg)
-            {
-                tempStream << std::setfill('0') << std::setw(2) << std::hex
-                           << byte << " ";
-            }
-            std::cout << tempStream.str() << std::endl;
-        }
-    }
     auto setStateEffecterStatesRespHandler =
         [](mctp_eid_t /*eid*/, const pldm_msg* response, size_t respMsgLen) {
             if (response == nullptr || !respMsgLen)

host-bmc/dbus_to_host_effecters.hpp

diff --git a/host-bmc/dbus_to_host_effecters.hpp b/host-bmc/dbus_to_host_effecters.hpp
index e274540..3dd8c38 100644
--- a/host-bmc/dbus_to_host_effecters.hpp
+++ b/host-bmc/dbus_to_host_effecters.hpp
@@ -76,17 +76,14 @@
      *  @param[in] dbusHandler - D-bus Handler
      *  @param[in] jsonPath - path for the json file
      *  @param[in] handler - PLDM request handler
-     *  @param[in] verbose - verbosity
      */
     explicit HostEffecterParser(
         pldm::dbus_api::Requester* requester, int fd, const pldm_pdr* repo,
         pldm::utils::DBusHandler* const dbusHandler,
         const std::string& jsonPath,
-        pldm::requester::Handler<pldm::requester::Request>* handler,
-        bool verbose = false) :
+        pldm::requester::Handler<pldm::requester::Request>* handler) :
         requester(requester),
-        sockFd(fd), pdrRepo(repo), dbusHandler(dbusHandler), handler(handler),
-        verbose(verbose)
+        sockFd(fd), pdrRepo(repo), dbusHandler(dbusHandler), handler(handler)
     {
         try
         {
@@ -182,7 +179,6 @@
     const pldm::utils::DBusHandler* dbusHandler; //!< D-bus Handler
     /** @brief PLDM request handler */
     pldm::requester::Handler<pldm::requester::Request>* handler;
-    bool verbose; //!< verbose flag
 };
 
 } // namespace host_effecters

host-bmc/host_pdr_handler.cpp

diff --git a/host-bmc/host_pdr_handler.cpp b/host-bmc/host_pdr_handler.cpp
index b8b362f..e09989a 100644
--- a/host-bmc/host_pdr_handler.cpp
+++ b/host-bmc/host_pdr_handler.cpp
@@ -31,12 +31,11 @@
     int mctp_fd, uint8_t mctp_eid, sdeventplus::Event& event, pldm_pdr* repo,
     const std::string& eventsJsonsDir, pldm_entity_association_tree* entityTree,
     pldm_entity_association_tree* bmcEntityTree, Requester& requester,
-    pldm::requester::Handler<pldm::requester::Request>* handler, bool verbose) :
+    pldm::requester::Handler<pldm::requester::Request>* handler) :
     mctp_fd(mctp_fd),
     mctp_eid(mctp_eid), event(event), repo(repo),
     stateSensorHandler(eventsJsonsDir), entityTree(entityTree),
-    bmcEntityTree(bmcEntityTree), requester(requester), handler(handler),
-    verbose(verbose)
+    bmcEntityTree(bmcEntityTree), requester(requester), handler(handler)
 {
     fs::path hostFruJson(fs::path(HOST_JSONS_DIR) / fruJson);
     if (fs::exists(hostFruJson))
@@ -147,11 +146,6 @@
         std::cerr << "Failed to encode_get_pdr_req, rc = " << rc << std::endl;
         return;
     }
-    if (verbose)
-    {
-        std::cout << "Sending Msg:" << std::endl;
-        printBuffer(requestMsg, verbose);
-    }
 
     rc = handler->registerRequest(
         mctp_eid, instanceId, PLDM_PLATFORM, PLDM_GET_PDR,
@@ -395,11 +389,6 @@
     std::vector<uint8_t> responsePDRMsg;
     responsePDRMsg.resize(respMsgLen + sizeof(pldm_msg_hdr));
     memcpy(responsePDRMsg.data(), response, respMsgLen + sizeof(pldm_msg_hdr));
-    if (verbose)
-    {
-        std::cout << "Receiving Msg:" << std::endl;
-        printBuffer(responsePDRMsg, verbose);
-    }
     if (rc != PLDM_SUCCESS)
     {
         std::cerr << "Failed to decode_get_pdr_resp, rc = " << rc << std::endl;
@@ -560,10 +549,6 @@
         requester.markFree(mctp_eid, instanceId);
         return;
     }
-    if (verbose)
-    {
-        printBuffer(requestMsg, verbose);
-    }
 
     auto getPLDMVersionHandler = [this](mctp_eid_t /*eid*/,
                                         const pldm_msg* response,

host-bmc/host_pdr_handler.hpp

diff --git a/host-bmc/host_pdr_handler.hpp b/host-bmc/host_pdr_handler.hpp
index ccafa66..6e8e03d 100644
--- a/host-bmc/host_pdr_handler.hpp
+++ b/host-bmc/host_pdr_handler.hpp
@@ -103,8 +103,7 @@
         pldm_entity_association_tree* entityTree,
         pldm_entity_association_tree* bmcEntityTree,
         pldm::dbus_api::Requester& requester,
-        pldm::requester::Handler<pldm::requester::Request>* handler,
-        bool verbose = false);
+        pldm::requester::Handler<pldm::requester::Request>* handler);
 
     /** @brief fetch PDRs from host firmware. See @class.
      *  @param[in] recordHandles - list of record handles pointing to host's
@@ -265,7 +264,6 @@
      *         PlatformEventMessage command request.
      */
     HostStateSensorMap sensorMap;
-    bool verbose;
 
     /** @brief whether response received from Host */
     bool responseReceived;