Adding support for asynchronous file transfer

common/utils.cpp

@@ -261,8 +261,9 @@ GetSubTreeResponse
     }
     catch (const std::exception& e)
     {
-        std::cerr << "failed GetSubTree query for interface " << ifaceList[0]
-                  << " with ERROR=" << e.what() << "\n";
+        error(
+            "failed GetSubTree query for interface {FACE_LIST} with ERROR = {ERR_EXCEP}",
+            "FACE_LIST", ifaceList[0], "ERR_EXCEP", e.what());
     }
     return response;
 }
@@ -289,7 +290,9 @@ void reportError(const char* errorMsg, const Severity& sev)
         }
         std::map<std::string, std::string> addlData{};
         method.append(errorMsg, severity, addlData);
-        bus.call_noreply(method);
+        bus.call_noreply(
+            method,
+            std::chrono::duration_cast<microsec>(sec(DBUS_TIMEOUT)).count());
     }
     catch (const std::exception& e)
     {
@@ -324,7 +327,9 @@ void DBusHandler::setDbusProperty(const DBusMapping& dBusMap,
                 service.c_str(), "/xyz/openbmc_project/inventory",
                 "xyz.openbmc_project.Inventory.Manager", "Notify");
             method.append(std::move(objectValueTree));
-            bus.call_noreply(method);
+            bus.call_noreply(
+                method, std::chrono::duration_cast<microsec>(sec(DBUS_TIMEOUT))
+                            .count());
         }
         else
         {
@@ -343,7 +348,9 @@ void DBusHandler::setDbusProperty(const DBusMapping& dBusMap,
             }
             method.append(dBusMap.interface.c_str(),
                           dBusMap.propertyName.c_str(), variant);
-            bus.call_noreply(method);
+            bus.call_noreply(
+                method, std::chrono::duration_cast<microsec>(sec(DBUS_TIMEOUT))
+                            .count());
         }
     };
 
@@ -727,7 +734,9 @@ void setBiosAttr(const BiosAttributeList& biosAttrList)
             method.append(
                 biosConfigIntf, "PendingAttributes",
                 std::variant<PendingAttributesType>(pendingAttributes));
-            bus.call_noreply(method);
+            bus.call_noreply(
+                method, std::chrono::duration_cast<microsec>(sec(DBUS_TIMEOUT))
+                            .count());
         }
         catch (const sdbusplus::exception::SdBusError& e)
         {

common/utils.hpp

@@ -59,11 +59,13 @@ struct CustomFD
     CustomFD(CustomFD&&) = delete;
     CustomFD& operator=(CustomFD&&) = delete;
 
-    CustomFD(int fd) : fd(fd) {}
+    CustomFD(int fd, bool closeOnOutScope = true) :
+        fd(fd), closeOnOutScope(closeOnOutScope)
+    {}
 
     ~CustomFD()
     {
-        if (fd >= 0)
+        if (fd >= 0 && closeOnOutScope)
         {
             close(fd);
         }
@@ -76,6 +78,7 @@ struct CustomFD
 
   private:
     int fd = -1;
+    bool closeOnOutScope;
 };
 
 /** @brief Calculate the pad for PLDM data

host-bmc/dbus/serialize.cpp

@@ -143,7 +143,7 @@ void Serialize::reSerialize(const std::vector<uint16_t> types)
     {
         if (savedObjs.contains(type))
         {
-            error(
+            info(
                 "Removing objects of type : {OBJ_TYP} from the persistent cache",
                 "OBJ_TYP", (unsigned)type);
             savedObjs.erase(savedObjs.find(type));

host-bmc/host_pdr_handler.cpp

@@ -1476,7 +1476,7 @@ void HostPDRHandler::getPresentStateBySensorReadigs(
             ++sensorMapIndex;
             if (sensorMapIndex == sensorMap.end())
             {
-                // std::cerr << "sensor map completed\n";
+                // error("sensor map completed");
                 ++objMapIndex;
                 sensorMapIndex = sensorMap.begin();
             }
@@ -1543,7 +1543,7 @@ void HostPDRHandler::getPresentStateBySensorReadigs(
         ++sensorMapIndex;
         if (sensorMapIndex == sensorMap.end())
         {
-            // std::cerr << "sensor map completed\n";
+            // error("sensor map completed");
             ++objMapIndex;
             sensorMapIndex = sensorMap.begin();
         }

libpldmresponder/bios_config.cpp

@@ -485,7 +485,9 @@ void BIOSConfig::updateBaseBIOSTableProperty()
         }
 #endif
         method.append(biosConfigInterface, biosConfigPropertyName, value);
-        bus.call_noreply(method);
+        bus.call_noreply(
+            method,
+            std::chrono::duration_cast<microsec>(sec(DBUS_TIMEOUT)).count());
     }
     catch (const std::exception& e)
     {

libpldmresponder/fru.cpp

@@ -212,7 +212,7 @@ void FruImpl::buildFRUTable()
                 }
                 catch (const std::exception& e)
                 {
-                    info(
+                    error(
                         "Config JSONs missing for the item interface type, interface = {INTF}",
                         "INTF", interface.first);
                     break;
@@ -561,7 +561,7 @@ void FruImpl::buildIndividualFRU(const std::string& fruInterface,
         pldm_entity node_entity = pldm_entity_extract(node);
         objToEntityNode[fruObjectPath] = node_entity;
         error(
-            "Building Individual FRU [FRU_OBJ_PATH] with entityid [ {ENTITY_TYP}, {ENTITY_NUM}, {ENTITY_ID} ] Parent :[ {P_ENTITY_TYP}, {P_ENTITY_NUM}, {P_ENTITY_ID} ]",
+            "Building Individual FRU [{FRU_OBJ_PATH}] with entityid [ {ENTITY_TYP}, {ENTITY_NUM}, {ENTITY_ID} ] Parent :[ {P_ENTITY_TYP}, {P_ENTITY_NUM}, {P_ENTITY_ID} ]",
             "FRU_OBJ_PATH", fruObjectPath, "ENTITY_TYP",
             static_cast<unsigned>(node_entity.entity_type), "ENTITY_NUM",
             static_cast<unsigned>(node_entity.entity_instance_num), "ENTITY_ID",
@@ -602,7 +602,7 @@ void FruImpl::buildIndividualFRU(const std::string& fruInterface,
     }
     catch (const std::exception& e)
     {
-        info(
+        error(
             "Config JSONs missing for the item in concurrent add path interface type, interface = {FRU_INTF}",
             "FRU_INTF", fruInterface);
     }

libpldmresponder/platform.cpp

@@ -73,7 +73,7 @@ void Handler::generate(const pldm::utils::DBusHandler& dBusIntf,
 {
     for (const auto& directory : dir)
     {
-        error("checking if : {DIR} exists", "DIR", directory.c_str());
+        info("checking if : {DIR} exists", "DIR", directory.c_str());
         if (!fs::exists(directory))
         {
             return;

libpldmresponder/test/libpldmresponder_platform_test.cpp

@@ -198,13 +198,10 @@ TEST(getPDR, testFindPDR)
                                            // current is not what we want
 
         pldm_pdr_hdr* hdr = reinterpret_cast<pldm_pdr_hdr*>(resp->record_data);
-        std::cerr << "PDR next record handle " << handle << "\n";
-        std::cerr << "PDR type " << hdr->type << "\n";
         if (hdr->type == PLDM_STATE_EFFECTER_PDR)
         {
             pldm_state_effecter_pdr* pdr =
                 reinterpret_cast<pldm_state_effecter_pdr*>(resp->record_data);
-            std::cerr << "PDR entity type " << pdr->entity_type << "\n";
             if (pdr->entity_type == 100)
             {
                 found = true;