X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=CAN-binder%2Flow-can-binding%2Futils%2Fsignals.hpp;h=ffabe81b6fffe18e3965b1a6ec84c68064c0071a;hb=e9b00c3af0c469726e32755715a69395ad1d3718;hp=e94175692608974717c5bf4f24694098c5ec5032;hpb=49fe0eec8f17698fc5f86d0abe01777af1fb2b23;p=apps%2Fagl-service-can-low-level.git

diff --git a/CAN-binder/low-can-binding/utils/signals.hpp b/CAN-binder/low-can-binding/utils/signals.hpp
index e9417569..ffabe81b 100644
--- a/CAN-binder/low-can-binding/utils/signals.hpp
+++ b/CAN-binder/low-can-binding/utils/signals.hpp
@@ -22,69 +22,61 @@
 #include <fnmatch.h>
 
 #include "openxc.pb.h"
-#include "../configuration.hpp"
+#include "../binding/application.hpp"
 #include "../can/can-signals.hpp"
 #include "../diagnostic/diagnostic-message.hpp"
 
-#include "../low-can-binding.hpp"
+#include "../binding/low-can-hat.hpp"
+#include "../binding/low-can-cb.hpp"
 
-extern std::mutex subscribed_signals_mutex;
-std::mutex& get_subscribed_signals_mutex();
-
-/**
- * @brief return the subscribed_signals map.
- * 
- * return Map of subscribed signals.
- */
-extern std::map<std::string, struct afb_event> subscribed_signals;
-std::map<std::string, struct afb_event>& get_subscribed_signals();
-
-template <typename T>
-void lookup_signals_by_name(const std::string& key, std::vector<T>& signals, std::vector<T*>& found_signals)
+namespace utils
 {
-	for(T& s : signals)
+	struct signals_found
 	{
-		if(::fnmatch(key.c_str(), s.get_generic_name().c_str(), FNM_CASEFOLD) == 0)
-			found_signals.push_back(&s);
-		if(::fnmatch(key.c_str(), s.get_name().c_str(), FNM_CASEFOLD) == 0)
-			found_signals.push_back(&s);
-	}
-}
+		std::vector<std::shared_ptr<can_signal_t> > can_signals;
+		std::vector<std::shared_ptr<diagnostic_message_t> > diagnostic_messages;
+	};
 
-template <typename T>
-void lookup_signals_by_name(const std::string& key, std::vector<T>& signals, std::vector<std::string>& found_signals_name)
-{
-	for(T& s : signals)
+	class signals_manager_t
 	{
-		if(::fnmatch(key.c_str(), s.get_generic_name().c_str(), FNM_CASEFOLD) == 0)
-			found_signals_name.push_back(s.get_name());
-		if(::fnmatch(key.c_str(), s.get_name().c_str(), FNM_CASEFOLD) == 0)
-			found_signals_name.push_back(s.get_name());
-	}
-}
+	private:
+		std::mutex subscribed_signals_mutex_;
+		std::map<int, std::shared_ptr<low_can_subscription_t> > subscribed_signals_;
 
-template <typename T>
-void lookup_signals_by_id(const double key, std::vector<T>& signals, std::vector<T*>& found_signals)
-{
-	for(T& s : signals)
-	{
-		if(configuration_t::instance().get_signal_id(s) == key)
+		signals_manager_t(); ///< Private constructor to make singleton class.
+
+	public:
+		static signals_manager_t& instance();
+
+		std::mutex& get_subscribed_signals_mutex();
+		std::map<int, std::shared_ptr<low_can_subscription_t> >& 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);
+
+		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)
 		{
-			found_signals.push_back(&s);
+			for(std::shared_ptr<T> s : signals)
+			{
+				if(::fnmatch(key.c_str(), s->get_generic_name().c_str(), FNM_CASEFOLD) == 0)
+					found_signals.push_back(s);
+				else if(::fnmatch(key.c_str(), s->get_name().c_str(), FNM_CASEFOLD) == 0)
+					found_signals.push_back(s);
+			}
 		}
-	}
-}
 
-template <typename T>
-void lookup_signals_by_id(const double key, std::vector<T>& signals, std::vector<std::string>& found_signals_name)
-{
-	for(T& s : signals)
-	{
-		if(configuration_t::instance().get_signal_id(s) == key)
+		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)
 		{
-			found_signals_name.push_back(s.get_name());
+			for(std::shared_ptr<T> s : signals)
+			{
+				if(application_t::instance().get_signal_id(*s) == key)
+				{
+					found_signals.push_back(s);
+				}
+			}
 		}
-	}
-}
-
-std::vector<std::string> find_signals(const openxc_DynamicField &key);
+	};
+}
\ No newline at end of file