commit 69e2b29822e256d9c186db54b63ae4a3d800c4bb
author Ed Tanous <edtanous@google.com> Mon Sep 19 19:47:01 2022 -0700
committer Ed Tanous <edtanous@google.com> Tue Sep 20 08:45:37 2022 -0700
tree 48bbfd9143d390270a320a4a4212ba76cffc12a6
parent 4ecc47b99a228edbf2f4bc8dbd5c7aecaab7d8c5

Combine owned strings

There are two lists in object_server for storing strings that need their
lifetime extended for both methods and signal names.  Neither list is
used independently, and exists entirely just to store strings to give
the vtables something to point to, so there's no sense in keeping two
lists.

As some point, these could arguably become static sets, so that strings
memory footprints are deduplicated between interfaces in the same
daemon, but that is a more invasive change.

Signed-off-by: Ed Tanous <edtanous@google.com>
Change-Id: Ie676a4ffb524387abf12a0ed20f50d109c85bc58

include/sdbusplus/asio/object_server.hpp

diff --git a/include/sdbusplus/asio/object_server.hpp b/include/sdbusplus/asio/object_server.hpp
index 45f3e4f..a8fcc53 100644
--- a/include/sdbusplus/asio/object_server.hpp
+++ b/include/sdbusplus/asio/object_server.hpp
@@ -541,13 +541,8 @@
         static constexpr auto signature = utility::tuple_to_array(
             message::types::type_id<SignalSignature...>());
 
-        auto [itr, inserted] = signalNames_.insert(name);
-        if (!inserted)
-        {
-            return false;
-        }
-
-        vtable_.emplace_back(vtable::signal(itr->c_str(), signature.data()));
+        const std::string& itr = methodOrSignalNames_.emplace_back(name);
+        vtable_.emplace_back(vtable::signal(itr.c_str(), signature.data()));
         return true;
     }
 
@@ -570,7 +565,7 @@
         static const auto resultType =
             utility::tuple_to_array(message::types::type_id<ResultType>());
 
-        auto nameItr = methodNames_.emplace(methodNames_.end(), name);
+        const std::string& nameItr = methodOrSignalNames_.emplace_back(name);
 
         if constexpr (callbackYields<CallbackType>)
         {
@@ -585,7 +580,7 @@
                     std::move(handler));
         }
 
-        vtable_.emplace_back(vtable::method(nameItr->c_str(), argType.data(),
+        vtable_.emplace_back(vtable::method(nameItr.c_str(), argType.data(),
                                             resultType.data(), method_handler));
         return true;
     }
@@ -773,8 +768,7 @@
     std::string path_;
     std::string name_;
     std::list<std::string> propertyNames_;
-    std::list<std::string> methodNames_;
-    std::set<std::string> signalNames_;
+    std::list<std::string> methodOrSignalNames_;
     std::unordered_map<std::string, std::unique_ptr<callback>> callbacksGet_;
     std::unordered_map<std::string, std::unique_ptr<callback_set>>
         callbacksSet_;