Fix: correctly stop the binding.

Automatically destroying C++ objects wasn't sufficient since
it uses thread with locks that were waiting forever if there is
no CAN bus activity. Now correctly wake-up the threads to ends
them even if there without activity on the CAN bus.

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

diff --git a/low-can-binding/can/can-bus.cpp b/low-can-binding/can/can-bus.cpp
index d773ad3..040cb5f 100644 (file)
--- a/low-can-binding/can/can-bus.cpp
+++ b/low-can-binding/can/can-bus.cpp
@@ -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.
@@ -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();
        }
 }
 

diff --git a/low-can-binding/can/can-bus.hpp b/low-can-binding/can/can-bus.hpp
index 1878266..826d7c6 100644 (file)
--- a/low-can-binding/can/can-bus.hpp
+++ b/low-can-binding/can/can-bus.hpp
@@ -70,6 +70,7 @@ private:
 public:
        explicit can_bus_t(utils::config_parser_t conf_file);
        can_bus_t(can_bus_t&&);
+       ~can_bus_t();
 
        void set_can_devices();
        int get_can_device_index(const std::string& bus_name) const;