From c72b891193f15622de56f086311ef494cda046ea Mon Sep 17 00:00:00 2001
From: Matthew Barth <msbarth@us.ibm.com>
Date: Fri, 19 Jan 2018 17:28:18 -0600
Subject: Minimize service name mapper lookups

Retrieve the service names from the cached dataset within the zone for a
path and interface, updating the cache when not found. This is used when
initializing property values and service name owners.

Additional performance enhancements to use `GetSubTree` prior to
processing a set speed event will be included under
openbmc/openbmc#2911. This will keep unnecessary `GetSubTree` lookups
from occurring for paths/interfaces that don't exist to further improve
upon initializing properties fan control is defined to use.

Tested:
    First path updates service name cache for all paths sharing the same
interface
    First missing interface on a path updates service name cache for all
paths sharing that interface
    Verify mapper lookups for X number of paths sharing the same
interface is reduced to (X-(X-1))
    NameOwnerChanged events read/update the same set of service name
cache

Change-Id: Ia235b36ba5ae8cda38342d7521f3d87080c2970a
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
---
 control/functor.hpp | 6 +++---
 control/zone.cpp    | 6 ++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/control/functor.hpp b/control/functor.hpp
index 06e8db9..8e85fcb 100644
--- a/control/functor.hpp
+++ b/control/functor.hpp
@@ -107,7 +107,9 @@ struct PropertyChanged
         {
             try
             {
+                auto service = zone.getService(_path, _iface);
                 auto val = util::SDBusPlus::getProperty<T>(bus,
+                                                           service,
                                                            _path,
                                                            _iface,
                                                            _property);
@@ -306,9 +308,7 @@ struct NameOwnerChanged
             try
             {
                 // Initialize NameOwnerChanged data store with service name
-                name = util::SDBusPlus::getService(bus,
-                                                   _path,
-                                                   _iface);
+                name = zone.getService(_path, _iface);
                 hasOwner = util::SDBusPlus::callMethodAndRead<bool>(
                         bus,
                         "org.freedesktop.DBus",
diff --git a/control/zone.cpp b/control/zone.cpp
index 41ee0cc..325a5b8 100644
--- a/control/zone.cpp
+++ b/control/zone.cpp
@@ -186,10 +186,8 @@ void Zone::setServices(const Group* group)
         bool hasOwner = false;
         try
         {
-            name = util::SDBusPlus::getService(
-                    _bus,
-                    it->first,
-                    std::get<intfPos>(it->second));
+            name = getService(it->first,
+                              std::get<intfPos>(it->second));
             hasOwner = util::SDBusPlus::callMethodAndRead<bool>(
                     _bus,
                     "org.freedesktop.DBus",
-- 
cgit v1.2.1