commit 9bb4a3867ab1cc14605b6fc56a696b18bff80e20
author Vernon Mauery <vernon.mauery@linux.intel.com> Fri Nov 05 12:46:19 2021 -0700
committer Vernon Mauery <vernon.mauery@linux.intel.com> Tue Nov 23 01:14:12 2021 +0000
tree 33fc5185e300a3502f86ddfeb50979079880ef16
parent c2c3a40ad528dc18e708edb8abd1b6e3f5469ebf

Rework setNmiProperty to use yielding Dbus API

setNmiProperty was the last holdout making blocking Dbus calls in the
ipmiChassisControl function. This converts the blocking calls to
yielding calls, making use of the Context object.

Tested: ipmitool chassis power diag
        Check host to see that it recieved an NMI

Change-Id: I4d96752b020947cc08a1e985213afc1af735344d
Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com>

chassishandler.cpp

diff --git a/chassishandler.cpp b/chassishandler.cpp
index f4d9209..737d3d2 100644
--- a/chassishandler.cpp
+++ b/chassishandler.cpp
@@ -886,7 +886,7 @@
 // Set Enabled property to inform NMI source
 // handling to trigger a NMI_OUT BSOD.
 //------------------------------------------
-int setNmiProperty(const bool value)
+int setNmiProperty(ipmi::Context::ptr& ctx, const bool value)
 {
     constexpr const char* nmiSourceObjPath =
         "/xyz/openbmc_project/Chassis/Control/NMISource";
@@ -894,20 +894,24 @@
         "xyz.openbmc_project.Chassis.Control.NMISource";
     std::string bmcSourceSignal = "xyz.openbmc_project.Chassis.Control."
                                   "NMISource.BMCSourceSignal.ChassisCmd";
-    std::shared_ptr<sdbusplus::asio::connection> busp = getSdBus();
 
-    try
+    std::string service;
+    boost::system::error_code ec =
+        ipmi::getService(ctx, nmiSourceIntf, nmiSourceObjPath, service);
+    if (!ec)
     {
-        auto service = ipmi::getService(*busp, nmiSourceIntf, nmiSourceObjPath);
-        ipmi::setDbusProperty(*busp, service, nmiSourceObjPath, nmiSourceIntf,
-                              "BMCSource", bmcSourceSignal);
-        ipmi::setDbusProperty(*busp, service, nmiSourceObjPath, nmiSourceIntf,
-                              "Enabled", value);
+        ec = ipmi::setDbusProperty(ctx, service, nmiSourceObjPath,
+                                   nmiSourceIntf, "BMCSource", bmcSourceSignal);
     }
-    catch (const std::exception& e)
+    if (!ec)
+    {
+        ec = ipmi::setDbusProperty(ctx, service, nmiSourceObjPath,
+                                   nmiSourceIntf, "Enabled", value);
+    }
+    if (ec)
     {
         log<level::ERR>("Failed to trigger NMI_OUT",
-                        entry("EXCEPTION=%s", e.what()));
+                        entry("EXCEPTION=%s", ec.message().c_str()));
         return -1;
     }
 
@@ -1344,7 +1348,7 @@
             rc = initiateHostStateTransition(ctx, State::Host::Transition::Off);
             break;
         case CMD_PULSE_DIAGNOSTIC_INTR:
-            rc = setNmiProperty(true);
+            rc = setNmiProperty(ctx, true);
             break;
 
         default: