From: Romain Forlot <romain.forlot@iot.bzh>
Date: Thu, 14 Nov 2019 14:09:57 +0000 (+0100)
Subject: application: Add dedicated function to set parents
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=4a0b8a5bc5d40f92cff93caf3c52da9957fe001f;p=apps%2Fagl-service-can-low-level.git

application: Add dedicated function to set parents

Change-Id: Iedd493b9e4043290dae0aa9d1d94a3d9179525ae
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
---

diff --git a/low-can-binding/binding/application.cpp b/low-can-binding/binding/application.cpp
index c4da68ae..063a11da 100644
--- a/low-can-binding/binding/application.cpp
+++ b/low-can-binding/binding/application.cpp
@@ -54,25 +54,12 @@ uint8_t application_t::get_active_message_set() const
 
 int application_t::add_message_set(std::shared_ptr<message_set_t> new_message_set)
 {
-
-	vect_ptr_msg_def_t messages_definition = new_message_set->get_messages_definition();
-	for(std::shared_ptr<message_definition_t> cmd : messages_definition)
-	{
-		cmd->set_parent(new_message_set);
-		std::vector<std::shared_ptr<signal_t>> signals = cmd->get_signals();
-		for(std::shared_ptr<signal_t> sig: signals)
-			sig->set_parent(cmd);
-	}
-
-	std::vector<std::shared_ptr<diagnostic_message_t>> diagnostic_messages = new_message_set->get_diagnostic_messages();
-	for(std::shared_ptr<diagnostic_message_t> dm : diagnostic_messages)
-		dm->set_parent(new_message_set);
+	set_parents(new_message_set);
 
 	for(auto old_msg_set : message_set_)
 	{
 		if(old_msg_set->get_index() == new_message_set->get_index())
 		{
-
 			for(auto new_msg_def : new_message_set->get_messages_definition())
 			{
 				if(old_msg_set->add_message_definition(new_msg_def) < 0)
@@ -84,7 +71,6 @@ int application_t::add_message_set(std::shared_ptr<message_set_t> new_message_se
 				if(old_msg_set->add_diagnostic_message(new_diag_msg) < 0)
 					return -1;
 			}
-
 			return 0;
 		}
 	}
@@ -196,6 +182,22 @@ bool application_t::is_engine_on()
 	return engine_on;
 }
 
+void application_t::set_parents(std::shared_ptr<message_set_t> new_message_set)
+{
+	vect_ptr_msg_def_t messages_definition = new_message_set->get_messages_definition();
+	for(std::shared_ptr<message_definition_t> cmd : messages_definition)
+	{
+		cmd->set_parent(new_message_set);
+		std::vector<std::shared_ptr<signal_t>> signals = cmd->get_signals();
+		for(std::shared_ptr<signal_t> sig: signals)
+			sig->set_parent(cmd);
+	}
+
+	std::vector<std::shared_ptr<diagnostic_message_t>> diagnostic_messages = new_message_set->get_diagnostic_messages();
+	for(std::shared_ptr<diagnostic_message_t> dm : diagnostic_messages)
+		dm->set_parent(new_message_set);
+}
+
 #ifdef USE_FEATURE_J1939
 std::shared_ptr<utils::socketcan_t> application_t::get_socket_address_claiming()
 {
diff --git a/low-can-binding/binding/application.hpp b/low-can-binding/binding/application.hpp
index 3438c6a4..c445c899 100644
--- a/low-can-binding/binding/application.hpp
+++ b/low-can-binding/binding/application.hpp
@@ -57,6 +57,7 @@ class application_t
 		//std::shared_ptr<utils::socketcan_j1939_addressclaiming_t> socket_address_claiming_;
 #endif
 		application_t(); ///< Private constructor with implementation generated by the AGL generator.
+		void set_parents(std::shared_ptr<message_set_t> new_message_set);
 
 	public:
 		static application_t& instance();