PLDM:Use new alias of DBUS_TIMEOUT for bus.call
This commit uses a new global variable for DBUS_TIMEOUT which is included as an input parameter for bus.call dbus calls. The new alias makes the bus.call function shorter and readable.
Change-Id: I336c97bc0631d5370ff3648e41f50e3e283d771b
Signed-off-by: vkaverap@in.ibm.com <vkaverap@in.ibm.com>
diff --git a/oem/ibm/libpldmresponder/file_io_type_dump.cpp b/oem/ibm/libpldmresponder/file_io_type_dump.cpp
index f23cb20..0792795 100644
--- a/oem/ibm/libpldmresponder/file_io_type_dump.cpp
+++ b/oem/ibm/libpldmresponder/file_io_type_dump.cpp
@@ -69,9 +69,7 @@
bus.new_method_call(DUMP_MANAGER_BUSNAME, DUMP_MANAGER_PATH,
OBJECT_MANAGER_INTERFACE, "GetManagedObjects");
- auto reply = bus.call(
- method,
- std::chrono::duration_cast<microsec>(sec(DBUS_TIMEOUT)).count());
+ auto reply = bus.call(method, dbusTimeout);
reply.read(objects);
}
catch (const sdbusplus::exception_t& e)
@@ -287,9 +285,7 @@
auto method = bus.new_method_call(
"xyz.openbmc_project.Dump.Manager", path.c_str(),
"xyz.openbmc_project.Object.Delete", "Delete");
- bus.call(method,
- std::chrono::duration_cast<microsec>(sec(DBUS_TIMEOUT))
- .count());
+ bus.call(method, dbusTimeout);
}
catch (const std::exception& e)
{
diff --git a/oem/ibm/libpldmresponder/file_io_type_pel.cpp b/oem/ibm/libpldmresponder/file_io_type_pel.cpp
index 2d1c68a..3e33cc6 100644
--- a/oem/ibm/libpldmresponder/file_io_type_pel.cpp
+++ b/oem/ibm/libpldmresponder/file_io_type_pel.cpp
@@ -108,9 +108,7 @@
auto method = bus.new_method_call(service.c_str(), logObjPath,
logInterface, "GetPEL");
method.append(fileHandle);
- auto reply = bus.call(
- method,
- std::chrono::duration_cast<microsec>(sec(DBUS_TIMEOUT)).count());
+ auto reply = bus.call(method, dbusTimeout);
sdbusplus::message::unix_fd fd{};
reply.read(fd);
auto rc = transferFileData(fd, true, offset, length, address);
@@ -141,9 +139,7 @@
auto method = bus.new_method_call(service.c_str(), logObjPath,
logInterface, "GetPEL");
method.append(fileHandle);
- auto reply = bus.call(
- method,
- std::chrono::duration_cast<microsec>(sec(DBUS_TIMEOUT)).count());
+ auto reply = bus.call(method, dbusTimeout);
sdbusplus::message::unix_fd fd{};
reply.read(fd);
diff --git a/oem/ibm/libpldmresponder/file_io_type_vpd.cpp b/oem/ibm/libpldmresponder/file_io_type_vpd.cpp
index 9c14c33..e136214 100644
--- a/oem/ibm/libpldmresponder/file_io_type_vpd.cpp
+++ b/oem/ibm/libpldmresponder/file_io_type_vpd.cpp
@@ -38,7 +38,7 @@
"org.freedesktop.DBus.Properties",
"Get");
method.append(keywrdInterface, keywrdPropName);
- auto reply = bus.call(method);
+ auto reply = bus.call(method, dbusTimeout);
reply.read(keywrd);
}
catch (const std::exception& e)
diff --git a/oem/ibm/libpldmresponder/inband_code_update.cpp b/oem/ibm/libpldmresponder/inband_code_update.cpp
index b74e101..e4fed04 100644
--- a/oem/ibm/libpldmresponder/inband_code_update.cpp
+++ b/oem/ibm/libpldmresponder/inband_code_update.cpp
@@ -170,9 +170,7 @@
method.append("xyz.openbmc_project.Association", "endpoints");
std::variant<std::vector<std::string>> paths;
- auto reply = bus.call(
- method,
- std::chrono::duration_cast<microsec>(sec(DBUS_TIMEOUT)).count());
+ auto reply = bus.call(method, dbusTimeout);
reply.read(paths);
runningVersion = std::get<std::vector<std::string>>(paths)[0];
@@ -181,9 +179,7 @@
propIntf, "Get");
method1.append("xyz.openbmc_project.Association", "endpoints");
- auto reply1 = bus.call(
- method1,
- std::chrono::duration_cast<microsec>(sec(DBUS_TIMEOUT)).count());
+ auto reply1 = bus.call(method1, dbusTimeout);
reply1.read(paths);
for (const auto& path : std::get<std::vector<std::string>>(paths))
{