X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Futils%2Fsignals.hpp;h=b7b2ca0303b0aeeaf272fc1da1b6c439c1dc1078;hb=b6bc89e63ee24c4e5ec1559d7390da90201ff9cd;hp=555c5dd62d7fee97b20dd51198f5e57abc73f50d;hpb=32e25cbca210a359b09768537b6f443fe90a3070;p=apps%2Fagl-service-can-low-level.git

diff --git a/low-can-binding/utils/signals.hpp b/low-can-binding/utils/signals.hpp
index 555c5dd6..b7b2ca03 100644
--- a/low-can-binding/utils/signals.hpp
+++ b/low-can-binding/utils/signals.hpp
@@ -17,27 +17,30 @@
 
 #pragma once
 
+#include <list>
 #include <vector>
 #include <string>
 #include <fnmatch.h>
 
 #include "openxc.pb.h"
 #include "../binding/application.hpp"
-#include "../can/can-signals.hpp"
+#include "../can/signals.hpp"
 #include "../diagnostic/diagnostic-message.hpp"
 
-#include "../binding/low-can-hat.hpp"
 #include "../binding/low-can-subscription.hpp"
 
+typedef std::list<std::shared_ptr<signal_t>> list_ptr_signal_t;
+typedef std::list<std::shared_ptr<diagnostic_message_t>> list_ptr_diag_msg_t;
+
 namespace utils
 {
 	struct signals_found
 	{
-		std::vector<std::shared_ptr<can_signal_t> > can_signals;
-		std::vector<std::shared_ptr<diagnostic_message_t> > diagnostic_messages;
+		list_ptr_signal_t signals;
+		list_ptr_diag_msg_t diagnostic_messages;
 	};
 
-	/// @brief Signal manager singleton hold subscription object with attached afb_event and its mutex 
+	/// @brief Signal manager singleton hold subscription object with attached afb_event_t and its mutex
 	/// to read and write it safely.
 	/// It can be used to browse CAN signals and Diagnostic messages vectors and find a particular signal to
 	/// subscribe to.
@@ -45,7 +48,7 @@ namespace utils
 	{
 	private:
 		std::mutex subscribed_signals_mutex_;
-		std::map<int, std::shared_ptr<low_can_subscription_t> > subscribed_signals_; ///< Map containing all subscribed signals, key is the socket int value.
+		map_subscription subscribed_signals_; ///< Map containing all subscribed signals, key is the socket int value.
 
 		signals_manager_t(); ///< Private constructor to make singleton class.
 
@@ -53,14 +56,14 @@ namespace utils
 		static signals_manager_t& instance();
 
 		std::mutex& get_subscribed_signals_mutex();
-		std::map<int, std::shared_ptr<low_can_subscription_t> >& get_subscribed_signals();
+		map_subscription& get_subscribed_signals();
 
 		struct signals_found find_signals(const openxc_DynamicField &key);
-		void find_diagnostic_messages(const openxc_DynamicField &key, std::vector<std::shared_ptr<diagnostic_message_t> >& found_signals);
-		void find_can_signals(const openxc_DynamicField &key, std::vector<std::shared_ptr<can_signal_t> >& found_signals);
+		void find_diagnostic_messages(const openxc_DynamicField &key, vect_ptr_diag_msg_t& found_signals);
+		void find_signals(const openxc_DynamicField &key, vect_ptr_signal_t& found_signals);
 
 		template <typename T>
-		void lookup_signals_by_name(const std::string& key, std::vector<std::shared_ptr<T> > signals, std::vector<std::shared_ptr<T> >& found_signals)
+		void lookup_signals_by_name(const std::string& key, std::vector<std::shared_ptr<T> > signals, std::list<std::shared_ptr<T> >& found_signals)
 		{
 			for(std::shared_ptr<T> s : signals)
 			{
@@ -72,7 +75,7 @@ namespace utils
 		}
 
 		template <typename T>
-		void lookup_signals_by_id(const double key, std::vector<std::shared_ptr<T> > signals, std::vector<std::shared_ptr<T> >& found_signals)
+		void lookup_signals_by_id(const double key, std::vector<std::shared_ptr<T> > signals, std::list<std::shared_ptr<T> >& found_signals)
 		{
 			for(std::shared_ptr<T> s : signals)
 			{
@@ -83,4 +86,4 @@ namespace utils
 			}
 		}
 	};
-}
\ No newline at end of file
+}