summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Geissler <geissonator@yahoo.com>2019-02-27 09:57:37 -0600
committerMatt Spinler <spinler@us.ibm.com>2019-04-05 15:05:32 +0000
commit70461896775208bbe400cc23786ce4d17a0c07f7 (patch)
tree68af45f3182e1839787a077a9fada3fe05dfa45b
parent0a560a5c4f6447e2c8b4ba7216abebebe9aea0dd (diff)
downloadphosphor-objmgr-70461896775208bbe400cc23786ce4d17a0c07f7.zip
phosphor-objmgr-70461896775208bbe400cc23786ce4d17a0c07f7.tar.gz
unit-test: Move processing of interfaces added
Make it easier to unit test and continue reduction of main.cpp Change-Id: Id360255e1546eda026e5e6ef9f15d29dcc82caaa Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
-rw-r--r--src/main.cpp87
-rw-r--r--src/processing.cpp86
-rw-r--r--src/processing.hpp30
3 files changed, 120 insertions, 83 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 3208a17..5dd4698 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -497,11 +497,7 @@ int main(int argc, char** argv)
interfacesAddedHandler = [&interface_map, &name_owners, &server](
sdbusplus::message::message& message) {
sdbusplus::message::object_path obj_path;
- std::vector<std::pair<
- std::string, std::vector<std::pair<
- std::string, sdbusplus::message::variant<
- std::vector<Association>>>>>>
- interfaces_added;
+ InterfacesAdded interfaces_added;
message.read(obj_path, interfaces_added);
std::string well_known;
if (!getWellKnown(name_owners, message.get_sender(), well_known))
@@ -511,84 +507,9 @@ int main(int argc, char** argv)
if (needToIntrospect(well_known, service_whitelist,
service_blacklist))
{
- auto& iface_list = interface_map[obj_path.str];
-
- for (const auto& interface_pair : interfaces_added)
- {
- iface_list[well_known].emplace(interface_pair.first);
-
- if (interface_pair.first == ASSOCIATIONS_INTERFACE)
- {
- const sdbusplus::message::variant<
- std::vector<Association>>* variantAssociations =
- nullptr;
- for (const auto& interface : interface_pair.second)
- {
- if (interface.first == "associations")
- {
- variantAssociations = &(interface.second);
- }
- }
- if (variantAssociations == nullptr)
- {
- std::cerr << "Illegal association found on "
- << well_known << "\n";
- continue;
- }
- std::vector<Association> associations =
- sdbusplus::message::variant_ns::get<
- std::vector<Association>>(*variantAssociations);
- associationChanged(server, associations, obj_path.str,
- well_known, associationOwners,
- associationInterfaces);
- }
- }
-
- // To handle the case where an object path is being created
- // with 2 or more new path segments, check if the parent paths
- // of this path are already in the interface map, and add them
- // if they aren't with just the default freedesktop interfaces.
- // This would be done via introspection if they would have
- // already existed at startup. While we could also introspect
- // them now to do the work, we know there aren't any other
- // interfaces or we would have gotten signals for them as well,
- // so take a shortcut to speed things up.
- //
- // This is all needed so that mapper operations can be done
- // on the new parent paths.
- using iface_map_iterator = interface_map_type::iterator;
- using iface_map_value_type = boost::container::flat_map<
- std::string, boost::container::flat_set<std::string>>;
- using name_map_iterator = iface_map_value_type::iterator;
-
- static const boost::container::flat_set<std::string>
- default_ifaces{"org.freedesktop.DBus.Introspectable",
- "org.freedesktop.DBus.Peer",
- "org.freedesktop.DBus.Properties"};
-
- std::string parent = obj_path.str;
- auto pos = parent.find_last_of('/');
-
- while (pos != std::string::npos)
- {
- parent = parent.substr(0, pos);
-
- std::pair<iface_map_iterator, bool> parentEntry =
- interface_map.insert(
- std::make_pair(parent, iface_map_value_type{}));
-
- std::pair<name_map_iterator, bool> ifaceEntry =
- parentEntry.first->second.insert(
- std::make_pair(well_known, default_ifaces));
-
- if (!ifaceEntry.second)
- {
- // Entry was already there for this name so done.
- break;
- }
-
- pos = parent.find_last_of('/');
- }
+ processInterfaceAdded(interface_map, obj_path, interfaces_added,
+ well_known, associationOwners,
+ associationInterfaces, server);
}
};
diff --git a/src/processing.cpp b/src/processing.cpp
index 3cd348b..6dd6493 100644
--- a/src/processing.cpp
+++ b/src/processing.cpp
@@ -1,6 +1,7 @@
#include "processing.hpp"
#include <boost/algorithm/string/predicate.hpp>
+#include <iostream>
bool getWellKnown(
const boost::container::flat_map<std::string, std::string>& owners,
@@ -82,3 +83,88 @@ void processNameChangeDelete(
pathIt++;
}
}
+
+void processInterfaceAdded(interface_map_type& interfaceMap,
+ const sdbusplus::message::object_path& objPath,
+ const InterfacesAdded& intfAdded,
+ const std::string& wellKnown,
+ AssociationOwnersType& assocOwners,
+ AssociationInterfaces& assocInterfaces,
+ sdbusplus::asio::object_server& server)
+{
+ auto& ifaceList = interfaceMap[objPath.str];
+
+ for (const auto& interfacePair : intfAdded)
+ {
+ ifaceList[wellKnown].emplace(interfacePair.first);
+
+ if (interfacePair.first == ASSOCIATIONS_INTERFACE)
+ {
+ const sdbusplus::message::variant<std::vector<Association>>*
+ variantAssociations = nullptr;
+ for (const auto& interface : interfacePair.second)
+ {
+ if (interface.first == "associations")
+ {
+ variantAssociations = &(interface.second);
+ }
+ }
+ if (variantAssociations == nullptr)
+ {
+ std::cerr << "Illegal association found on " << wellKnown
+ << "\n";
+ continue;
+ }
+ std::vector<Association> associations =
+ sdbusplus::message::variant_ns::get<std::vector<Association>>(
+ *variantAssociations);
+ associationChanged(server, associations, objPath.str, wellKnown,
+ assocOwners, assocInterfaces);
+ }
+ }
+
+ // To handle the case where an object path is being created
+ // with 2 or more new path segments, check if the parent paths
+ // of this path are already in the interface map, and add them
+ // if they aren't with just the default freedesktop interfaces.
+ // This would be done via introspection if they would have
+ // already existed at startup. While we could also introspect
+ // them now to do the work, we know there aren't any other
+ // interfaces or we would have gotten signals for them as well,
+ // so take a shortcut to speed things up.
+ //
+ // This is all needed so that mapper operations can be done
+ // on the new parent paths.
+ using iface_map_iterator = interface_map_type::iterator;
+ using iface_map_value_type =
+ boost::container::flat_map<std::string,
+ boost::container::flat_set<std::string>>;
+ using name_map_iterator = iface_map_value_type::iterator;
+
+ static const boost::container::flat_set<std::string> defaultIfaces{
+ "org.freedesktop.DBus.Introspectable", "org.freedesktop.DBus.Peer",
+ "org.freedesktop.DBus.Properties"};
+
+ std::string parent = objPath.str;
+ auto pos = parent.find_last_of('/');
+
+ while (pos != std::string::npos)
+ {
+ parent = parent.substr(0, pos);
+
+ std::pair<iface_map_iterator, bool> parentEntry =
+ interfaceMap.insert(std::make_pair(parent, iface_map_value_type{}));
+
+ std::pair<name_map_iterator, bool> ifaceEntry =
+ parentEntry.first->second.insert(
+ std::make_pair(wellKnown, defaultIfaces));
+
+ if (!ifaceEntry.second)
+ {
+ // Entry was already there for this name so done.
+ break;
+ }
+
+ pos = parent.find_last_of('/');
+ }
+}
diff --git a/src/processing.hpp b/src/processing.hpp
index 8ef6e48..d5ed2b4 100644
--- a/src/processing.hpp
+++ b/src/processing.hpp
@@ -23,6 +23,17 @@ using interface_map_type = boost::container::flat_map<
std::string, boost::container::flat_map<
std::string, boost::container::flat_set<std::string>>>;
+/** @brief InterfacesAdded represents the dbus data from the signal
+ *
+ * There are 2 pairs
+ * pair1: D-bus Interface,vector[pair2]
+ * pair2: D-bus Method,vector[Associations]
+ */
+using InterfacesAdded = std::vector<std::pair<
+ std::string,
+ std::vector<std::pair<
+ std::string, sdbusplus::message::variant<std::vector<Association>>>>>>;
+
/** @brief Get well known name of input unique name
*
* If user passes in well known name then that will be returned.
@@ -70,3 +81,22 @@ void processNameChangeDelete(
interface_map_type& interfaceMap, AssociationOwnersType& assocOwners,
AssociationInterfaces& assocInterfaces,
sdbusplus::asio::object_server& server);
+
+/** @brief Handle an interfaces added signal
+ *
+ * @param[in,out] interfaceMap - Global map of interfaces
+ * @param[in] objPath - New path to process
+ * @param[in] interfacesAdded - New interfaces to process
+ * @param[in] wellKnown - Well known name that has new owner
+ * @param[in,out] assocOwners - Owners of associations
+ * @param[in,out] assocInterfaces - Associations endpoints
+ * @param[in,out] server - sdbus system object
+ *
+ */
+void processInterfaceAdded(interface_map_type& interfaceMap,
+ const sdbusplus::message::object_path& objPath,
+ const InterfacesAdded& intfAdded,
+ const std::string& wellKnown,
+ AssociationOwnersType& assocOwners,
+ AssociationInterfaces& assocInterfaces,
+ sdbusplus::asio::object_server& server);
OpenPOWER on IntegriCloud