backend/SourceContainer: more robust source identification

asherikov · Jan 14, 2025 · c4255fa · c4255fa
1 parent 49a12a1
commit c4255fa
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 10 deletions.
diff --git a/.utils/qa/scspell.dict b/.utils/qa/scspell.dict
@@ -17,6 +17,7 @@ fastcdr
 gmtime
 google
 gtest
+hasher
 https
 ingroup
 intrometry
@@ -29,6 +30,7 @@ namevalue
 nodiscard
 nolint
 npos
+passthrough
 pjmsg
 plotjuggler
 rclcpp
@@ -38,6 +40,7 @@ sherikov
 sstream
 stringstream
 strstream
+typeid
 yaml
 zstd
 
diff --git a/frontend/include/intrometry/backend/utils.h b/frontend/include/intrometry/backend/utils.h
@@ -13,6 +13,7 @@
 #include <mutex>
 #include <unordered_map>
 #include <functional>
+#include <typeinfo>
 
 #include <ariles2/ariles.h>
 
@@ -59,19 +60,37 @@ namespace intrometry::backend
     class INTROMETRY_HIDDEN SourceContainer
     {
     protected:
-        using SourceSet = std::unordered_map<std::string, t_Value>;
+        // passthrough hasher
+        struct Hasher
+        {
+            std::size_t operator()(const std::size_t key) const
+            {
+                return key;
+            }
+        };
 
-        SourceSet sources_;
+        using SourceMap = std::unordered_map<std::size_t, t_Value, Hasher>;
+
+    protected:
+        SourceMap sources_;
 
         std::mutex update_mutex_;
         std::mutex drain_mutex_;
 
+    protected:
+        static std::size_t hash(const ariles2::DefaultBase &source) const
+        {
+            // redundant
+            // const std::size_t ariles_hash = std::hash<std::string>{}(source.arilesDefaultID());
+            return (typeid(source).hash_code());
+        }
+
     public:
         void tryVisit(const std::function<void(t_Value &)> visitor)
         {
             if (drain_mutex_.try_lock())
             {
-                for (std::pair<const std::string, t_Value> &source : sources_)
+                for (std::pair<const std::size_t, t_Value> &source : sources_)
                 {
                     visitor(source.second);
                 }
@@ -86,33 +105,30 @@ namespace intrometry::backend
             const std::lock_guard<std::mutex> update_lock(update_mutex_);
             const std::lock_guard<std::mutex> drain_lock(drain_mutex_);
 
-            sources_.try_emplace(source.arilesDefaultID(), source, std::forward<t_Args>(args)...);
+            sources_.try_emplace(hash(source), source, std::forward<t_Args>(args)...);
         }
 
         void erase(const ariles2::DefaultBase &source)
         {
             const std::lock_guard<std::mutex> update_lock(update_mutex_);
             const std::lock_guard<std::mutex> drain_lock(drain_mutex_);
 
-            sources_.erase(source.arilesDefaultID());
+            sources_.erase(hash(source));
         }
 
         bool tryVisit(const ariles2::DefaultBase &source, const std::function<void(t_Value &)> visitor)
         {
             if (update_mutex_.try_lock())
             {
-                const typename SourceSet::iterator source_it = sources_.find(source.arilesDefaultID());
+                const typename SourceMap::iterator source_it = sources_.find(hash(source));
 
                 if (sources_.end() == source_it)
                 {
                     update_mutex_.unlock();
                     return (false);
                 }
-                else
-                {
-                    visitor(source_it->second);
-                }
 
+                visitor(source_it->second);
                 update_mutex_.unlock();
             }
             return (true);