commit 1af1223304dbf7aaecd5f238227abee95cce8b39
author Ratan Gupta <ratagupt@linux.vnet.ibm.com> Sat Nov 03 00:35:38 2018 +0530
committer Ratan Gupta <ratagupt@linux.vnet.ibm.com> Thu Jul 11 15:52:52 2019 +0530
tree 946875f937c4674215773fb9cf41dec5c79bf18d
parent d588404374ca8ecdfa22795c379f90b7a1c88b93

Fix emit interface added signal

Send the interface added signal once the object is fully
populated.

Here we are fixing this behaviour for two D-bus objects
1) Root Dbus object for user manager app.
2) Individual user D-bus object.

Before this fix was getting two signals for creation of user/manager
signal time=1562577322.850104 sender=:1.57 -> destination=(null destination) serial=346
       path=/xyz/openbmc_project/user; interface=org.freedesktop.DBus.ObjectManager; member=InterfacesAdded
signal time=1562577322.897089 sender=:1.57 -> destination=(null destination) serial=347
       path=/xyz/openbmc_project/user; interface=org.freedesktop.DBus.ObjectManager; member=InterfacesAdded

After the fix was getting single signal
signal time=1562577775.550198 sender=:1.156 -> destination=(null destination) serial=27
       path=/xyz/openbmc_project/user; interface=org.freedesktop.DBus.ObjectManager; member=InterfacesAdded

Change-Id: I20ac168fe4fc7cd94cd2032db6ebc1623af5943d
Signed-off-by: Ratan Gupta <ratagupt@linux.vnet.ibm.com>

user_mgr.cpp

diff --git a/user_mgr.cpp b/user_mgr.cpp
index 183afbe..17146e6 100644
--- a/user_mgr.cpp
+++ b/user_mgr.cpp
@@ -1112,7 +1112,7 @@
 }
 
 UserMgr::UserMgr(sdbusplus::bus::bus &bus, const char *path) :
-    UserMgrIface(bus, path), AccountPolicyIface(bus, path), bus(bus), path(path)
+    Ifaces(bus, path, true), bus(bus), path(path)
 {
     UserMgrIface::allPrivileges(privMgr);
     std::sort(groupsMgr.begin(), groupsMgr.end());
@@ -1221,6 +1221,9 @@
         AccountPolicyIface::accountUnlockTimeout(value32);
     }
     initUserObjects();
+
+    // emit the signal
+    this->emit_object_added();
 }
 
 } // namespace user

user_mgr.hpp

diff --git a/user_mgr.hpp b/user_mgr.hpp
index 4c24201..b25e9f2 100644
--- a/user_mgr.hpp
+++ b/user_mgr.hpp
@@ -33,6 +33,9 @@
 using AccountPolicyIface =
     sdbusplus::xyz::openbmc_project::User::server::AccountPolicy;
 
+using Ifaces =
+    sdbusplus::server::object::object<UserMgrIface, AccountPolicyIface>;
+
 using Privilege = std::string;
 using GroupList = std::vector<std::string>;
 using UserEnabled = bool;
@@ -59,7 +62,7 @@
 /** @class UserMgr
  *  @brief Responsible for managing user accounts over the D-Bus interface.
  */
-class UserMgr : public UserMgrIface, AccountPolicyIface
+class UserMgr : public Ifaces
 {
   public:
     UserMgr() = delete;

users.cpp

diff --git a/users.cpp b/users.cpp
index 84c401d..dafc2dc 100644
--- a/users.cpp
+++ b/users.cpp
@@ -55,15 +55,15 @@
 Users::Users(sdbusplus::bus::bus &bus, const char *path,
              std::vector<std::string> groups, std::string priv, bool enabled,
              UserMgr &parent) :
-    UsersIface(bus, path, true),
-    DeleteIface(bus, path),
+    Interfaces(bus, path, true),
     userName(std::experimental::filesystem::path(path).filename()),
     manager(parent)
 {
     UsersIface::userPrivilege(priv, true);
     UsersIface::userGroups(groups, true);
     UsersIface::userEnabled(enabled, true);
-    UsersIface::emit_object_added();
+
+    this->emit_object_added();
 }
 
 /** @brief delete user method.

users.hpp

diff --git a/users.hpp b/users.hpp
index 84a32f5..aa1726a 100644
--- a/users.hpp
+++ b/users.hpp
@@ -26,11 +26,9 @@
 {
 
 namespace Base = sdbusplus::xyz::openbmc_project;
-using UsersIface =
-    sdbusplus::server::object::object<Base::User::server::Attributes>;
-using DeleteIface =
-    sdbusplus::server::object::object<Base::Object::server::Delete>;
-
+using UsersIface = Base::User::server::Attributes;
+using DeleteIface = Base::Object::server::Delete;
+using Interfaces = sdbusplus::server::object::object<UsersIface, DeleteIface>;
 // Place where all user objects has to be created
 constexpr auto usersObjPath = "/xyz/openbmc_project/user";
 
@@ -39,7 +37,7 @@
 /** @class Users
  *  @brief Lists User objects and it's properties
  */
-class Users : public UsersIface, DeleteIface
+class Users : public Interfaces
 {
   public:
     Users() = delete;