X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=low-can-binding%2Fcan%2Fcan-bus.cpp;h=e798618d05a84ae0fade53009de1194ce9cf253b;hb=97a08a7e37835f0e8619d22c83243bee26a2bff2;hp=d5ad485fe4e0b217e20ac6500e539c9871b4a6dd;hpb=4af423a2a09683acf0a9ad1e0a77bc45c2c843d9;p=apps%2Fagl-service-can-low-level.git

diff --git a/low-can-binding/can/can-bus.cpp b/low-can-binding/can/can-bus.cpp
index d5ad485f..e798618d 100644
--- a/low-can-binding/can/can-bus.cpp
+++ b/low-can-binding/can/can-bus.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, 2016 "IoT.bzh"
+ * Copyright (C) 2015, 2018 "IoT.bzh"
  * Author "Romain Forlot" <romain.forlot@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -33,6 +33,16 @@
 #include "../utils/signals.hpp"
 #include "../utils/openxc-utils.hpp"
 
+/// @brief Class destructor
+///
+/// @param[in] conf_file - Stop threads and unlock them to correctly finish them
+/// even without any activity on the CAN bus.
+can_bus_t::~can_bus_t()
+{
+	stop_threads();
+	new_can_message_cv_.notify_one();
+}
+
 /// @brief Class constructor
 ///
 /// @param[in] conf_file - handle to the json configuration file.
@@ -40,10 +50,10 @@ can_bus_t::can_bus_t(utils::config_parser_t conf_file)
 	: conf_file_{conf_file}
 {}
 
-/// @brief Take a decoded message to determine if its value comply with the wanted
-/// filtering values.
+/// @brief Take a decoded message to determine if its value complies with the desired
+/// filters.
 ///
-/// @param[in] vehicle_message - A decoded message to analyze
+/// @param[in] vehicle_message - The decoded message to be analyzed.
 /// @param[in] can_subscription - the subscription which will be notified depending
 ///  on its filtering values. Filtering values are stored in the event_filtermember.
 ///
@@ -53,10 +63,10 @@ bool can_bus_t::apply_filter(const openxc_VehicleMessage& vehicle_message, std::
 	bool send = false;
 	if(is_valid(vehicle_message))
 	{
-		float min = std::isnan(can_subscription->get_min()) ? -INFINITY : can_subscription->get_min();
-		float max = std::isnan(can_subscription->get_max()) ? INFINITY : can_subscription->get_max();
+		float min = can_subscription->get_min();
+		float max = can_subscription->get_max();
 		double value = get_numerical_from_DynamicField(vehicle_message);
-		send = (value < min && value > max) ? false : true;
+		send = (value < min || value > max) ? false : true;
 	}
 	return send;
 }
@@ -77,12 +87,12 @@ void can_bus_t::process_can_signals(const can_message_t& can_message, std::map<i
 	openxc_DynamicField decoded_message;
 	openxc_VehicleMessage vehicle_message;
 
-	// First we have to found which can_signal_t it is
-	std::shared_ptr<low_can_subscription_t> sig = s[subscription_id];
-
 	if( s.find(subscription_id) != s.end() && afb_event_is_valid(s[subscription_id]->get_event()))
 	{
 		bool send = true;
+		// First we have to found which can_signal_t it is
+		std::shared_ptr<low_can_subscription_t> sig = s[subscription_id];
+
 		decoded_message = decoder_t::translate_signal(*sig->get_can_signal(), can_message, &send);
 		openxc_SimpleMessage s_message = build_SimpleMessage(sig->get_name(), decoded_message);
 		vehicle_message = build_VehicleMessage(s_message, can_message.get_timestamp());
@@ -91,7 +101,7 @@ void can_bus_t::process_can_signals(const can_message_t& can_message, std::map<i
 		{
 			std::lock_guard<std::mutex> decoded_can_message_lock(decoded_can_message_mutex_);
 			push_new_vehicle_message(subscription_id, vehicle_message);
-			AFB_DEBUG("%s CAN signals processed.",  sig->get_name().c_str());
+			AFB_DEBUG("%s CAN signals processed.", sig->get_name().c_str());
 		}
 	}
 }
@@ -158,8 +168,8 @@ void can_bus_t::can_decode_message()
 			}
 			can_message_lock.lock();
 		}
-	new_decoded_can_message_.notify_one();
-	can_message_lock.unlock();
+		new_decoded_can_message_.notify_one();
+		can_message_lock.unlock();
 	}
 }