commit 6f45ce04b88117364e7452fae92565993a70df02
author Nan Zhou <nanzhoumails@gmail.com> Mon Sep 19 23:05:38 2022 +0000
committer Nan Zhou <nanzhoumails@gmail.com> Tue Sep 27 23:06:15 2022 +0000
tree cc4e4318738d55df19a30bae86130f555fadedd8
parent e3d47cd468699980157aa901eae269f49b3a0218

bmc-vmi-ca: use processs_loop

In reference [1], sdbusplus introduces its own process loop. This patch
removed the unncesssary sdeventplus dependency from bmc-vmi-ca, and uses
the sdbusplus built-in process loop instead.

[1] https://gerrit.openbmc.org/c/openbmc/sdbusplus/+/56891

Tested:
1. The daemon starts correctly
2. Tested several dbus commands via busctl (introspect, DeleteAll, etc)

Signed-off-by: Nan Zhou <nanzhoumails@gmail.com>
Change-Id: I802f18f077e7b0bd3bf0b910c56b1f560fe342e7

bmc-vmi-ca/ca_certs_manager.hpp

diff --git a/bmc-vmi-ca/ca_certs_manager.hpp b/bmc-vmi-ca/ca_certs_manager.hpp
index f99a750..72e1ba4 100644
--- a/bmc-vmi-ca/ca_certs_manager.hpp
+++ b/bmc-vmi-ca/ca_certs_manager.hpp
@@ -6,7 +6,6 @@
 
 #include <sdbusplus/bus.hpp>
 #include <sdbusplus/server/object.hpp>
-#include <sdeventplus/source/event.hpp>
 
 namespace ca::cert
 {

bmc-vmi-ca/mainapp.cpp

diff --git a/bmc-vmi-ca/mainapp.cpp b/bmc-vmi-ca/mainapp.cpp
index 062a60d..fc1c7af 100644
--- a/bmc-vmi-ca/mainapp.cpp
+++ b/bmc-vmi-ca/mainapp.cpp
@@ -2,7 +2,7 @@
 
 #include "ca_certs_manager.hpp"
 
-#include <sdeventplus/event.hpp>
+#include <sdbusplus/server/manager.hpp>
 #include <string>
 
 int main()
@@ -13,16 +13,10 @@
     // Add sdbusplus ObjectManager
     sdbusplus::server::manager_t objManager(bus, objPath);
 
-    // Get default event loop
-    auto event = sdeventplus::Event::get_default();
-
-    // Attach the bus to sd_event to service user requests
-    bus.attach_event(event.get(), SD_EVENT_PRIORITY_NORMAL);
-
     ca::cert::CACertMgr manager(bus, objPath);
 
     std::string busName = "xyz.openbmc_project.Certs.ca.authority.Manager";
     bus.request_name(busName.c_str());
-    event.loop();
+    bus.process_loop();
     return 0;
 }

bmc-vmi-ca/meson.build

diff --git a/bmc-vmi-ca/meson.build b/bmc-vmi-ca/meson.build
index 93fb90a..bf69205 100644
--- a/bmc-vmi-ca/meson.build
+++ b/bmc-vmi-ca/meson.build
@@ -2,7 +2,6 @@
     phosphor_dbus_interfaces_dep,
     phosphor_logging_dep,
     sdbusplus_dep,
-    sdeventplus_dep,
 ]
 
 bmc_vmi_ca_lib = static_library(

test/ca_certs_manager_test.cpp

diff --git a/test/ca_certs_manager_test.cpp b/test/ca_certs_manager_test.cpp
index 3b4e9c5..9043aa3 100644
--- a/test/ca_certs_manager_test.cpp
+++ b/test/ca_certs_manager_test.cpp
@@ -3,7 +3,6 @@
 #include "bmc-vmi-ca/ca_certs_manager.hpp"
 
 #include <iterator>
-#include <sdeventplus/event.hpp>
 #include <string>
 #include <xyz/openbmc_project/Certs/error.hpp>
 #include <xyz/openbmc_project/Common/error.hpp>
@@ -64,8 +63,6 @@
 {
     auto bus = sdbusplus::bus::new_default();
     std::string objPath = "/xyz/openbmc_project/certs/ca";
-    auto event = sdeventplus::Event::get_default();
-    bus.attach_event(event.get(), SD_EVENT_PRIORITY_NORMAL);
     MockCACertMgr manager(bus, objPath.c_str());
 
     std::string csrString = "csr string";
@@ -77,8 +74,6 @@
 {
     auto bus = sdbusplus::bus::new_default();
     std::string objPath = "/xyz/openbmc_project/certs/ca";
-    auto event = sdeventplus::Event::get_default();
-    bus.attach_event(event.get(), SD_EVENT_PRIORITY_NORMAL);
     MockCACertMgr manager(bus, objPath.c_str());
 
     std::string csrString(4097, 'C');
@@ -89,9 +84,7 @@
 {
     auto bus = sdbusplus::bus::new_default();
     std::string objPath = "/xyz/openbmc_project/certs/ca";
-    auto event = sdeventplus::Event::get_default();
 
-    bus.attach_event(event.get(), SD_EVENT_PRIORITY_NORMAL);
     MockCACertMgr manager(bus, objPath.c_str());
 
     std::string csrString = "csr string";
@@ -108,8 +101,6 @@
 
     auto bus = sdbusplus::bus::new_default();
     std::string objPath = "/xyz/openbmc_project/certs/ca";
-    auto event = sdeventplus::Event::get_default();
-    bus.attach_event(event.get(), SD_EVENT_PRIORITY_NORMAL);
     MockCACertMgr manager(bus, objPath.c_str());
 
     std::string csrString = "csr string";