commit 7583460d683c82e3ff5d73ab9d03d36eb0ba557e
author Brad Bishop <bradleyb@fuzziesquirrel.com> Tue Dec 11 08:42:53 2018 -0500
committer Brad Bishop <bradleyb@fuzziesquirrel.com> Thu Dec 13 12:41:11 2018 +0000
tree f7954faf87a6bf2ee7edca6918766ca3ff104a38
parent dfbff6f2d593b5cfd4476da93a86545e55eed25e

bus: route bus deleter to implementation

Allow the bus deleter to be routed to a real or mock implementation.

Also prevents link errors such as:
  sysroots/i586-openbmc-linux/usr/include/sdbusplus/bus.hpp:68: undefined reference to `sd_bus_unref'
when libsystemd is not linked in.

Unit tests still pass and a Witherspoon system QEMU instance still
boots to a shell.

Change-Id: If498076ddc28acf166c9dab0502f7e209d6e1f2d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

sdbusplus/bus.hpp.in

diff --git a/sdbusplus/bus.hpp.in b/sdbusplus/bus.hpp.in
index 37f52bc..66961ee 100644
--- a/sdbusplus/bus.hpp.in
+++ b/sdbusplus/bus.hpp.in
@@ -65,12 +65,19 @@
 /** @brief unique_ptr functor to release a bus reference. */
 struct BusDeleter
 {
-    void operator()(sd_bus* ptr) const
+    BusDeleter() = delete;
+    explicit BusDeleter(SdBusInterface* interface) : m_interface(interface)
     {
-        deleter(ptr);
     }
 
-    decltype(&sd_bus_flush_close_unref) deleter = sd_bus_flush_close_unref;
+    void operator()(sd_bus* ptr) const
+    {
+        (m_interface->*deleter)(ptr);
+    }
+
+    SdBusInterface* m_interface;
+    decltype(&SdBusInterface::sd_bus_flush_close_unref) deleter =
+        &SdBusInterface::sd_bus_flush_close_unref;
 };
 
 /** @brief Convert a vector of strings to c-style char** array. */
@@ -443,10 +450,9 @@
 };
 
 inline bus::bus(busp_t b, sdbusplus::SdBusInterface* intf) :
-    _intf(intf), _bus(_intf->sd_bus_ref(b))
+    _intf(intf), _bus(_intf->sd_bus_ref(b), details::BusDeleter(intf))
 {
-    // We can leave this as the real deleter if we just use a null pointer.
-    _bus.get_deleter().deleter = sd_bus_unref;
+    _bus.get_deleter().deleter = &SdBusInterface::sd_bus_unref;
 
 #if @WANT_TRANSACTION@
     // Emitting object added causes a message to get the properties
@@ -461,10 +467,11 @@
 #endif
 }
 
-inline bus::bus(busp_t b) : _intf(&sdbus_impl), _bus(_intf->sd_bus_ref(b))
+inline bus::bus(busp_t b) :
+    _intf(&sdbus_impl),
+    _bus(_intf->sd_bus_ref(b), details::BusDeleter(&sdbus_impl))
 {
-    // We can leave this as the real deleter if we just use a null pointer.
-    _bus.get_deleter().deleter = sd_bus_unref;
+    _bus.get_deleter().deleter = &SdBusInterface::sd_bus_unref;
 
 #if @WANT_TRANSACTION@
     // Emitting object added causes a message to get the properties
@@ -479,7 +486,8 @@
 #endif
 }
 
-inline bus::bus(busp_t b, std::false_type) : _intf(&sdbus_impl), _bus(b)
+inline bus::bus(busp_t b, std::false_type) :
+    _intf(&sdbus_impl), _bus(b, details::BusDeleter(&sdbus_impl))
 {
 #if @WANT_TRANSACTION@
     // Emitting object added causes a message to get the properties