Improve granularity of BCM socket using one by signal

[apps/agl-service-can-low-level.git] / CAN-binder / low-can-binding / can / can-bus.cpp

diff --git a/CAN-binder/low-can-binding/can/can-bus.cpp b/CAN-binder/low-can-binding/can/can-bus.cpp
index 6f9e78d..bca9d03 100644 (file)
--- a/CAN-binder/low-can-binding/can/can-bus.cpp
+++ b/CAN-binder/low-can-binding/can/can-bus.cpp
@@ -29,7 +29,7 @@
 
 #include "can-signals.hpp"
 #include "can-decoder.hpp"
-#include "../configuration.hpp"
+#include "../binding/configuration.hpp"
 #include "../utils/signals.hpp"
 #include "../utils/openxc-utils.hpp"
 
@@ -80,7 +80,9 @@ int can_bus_t::can_reader()
                                {
                                        can_message_t msg;
                                        s.second->get_socket() >> msg;
-                                       push_new_can_message(msg);
+                                       std::lock_guard<std::mutex> can_message_lock(get_can_message_mutex());
+                                       { push_new_can_message(msg); }
+                                       get_new_can_message_cv().notify_one();
                                        }
                                }
                }
@@ -126,13 +128,17 @@ int can_bus_t::process_can_signals(can_message_t& can_message)
                //DEBUG(binder_interface, "Nb elt matched string: %d", (int)s.count(std::string(sig.generic_name));
                if( s.find(sig->get_name()) != s.end() && afb_event_is_valid(s[sig->get_name()]))
                {
-                       decoded_message = decoder_t::translateSignal(*sig, can_message, conf.get_can_signals());
+                       bool send = true;
+                       decoded_message = decoder_t::translateSignal(*sig, can_message, conf.get_can_signals(), &send);
 
-                       openxc_SimpleMessage s_message = build_SimpleMessage(sig->get_name(), decoded_message);
-                       vehicle_message = build_VehicleMessage(s_message);
+                       if(send)
+                       {
+                               openxc_SimpleMessage s_message = build_SimpleMessage(sig->get_name(), decoded_message);
+                               vehicle_message = build_VehicleMessage(s_message);
 
-                       std::lock_guard<std::mutex> decoded_can_message_lock(decoded_can_message_mutex_);
-                       push_new_vehicle_message(vehicle_message);
+                               std::lock_guard<std::mutex> decoded_can_message_lock(decoded_can_message_mutex_);
+                               push_new_vehicle_message(vehicle_message);
+                       }
                        processed_signals++;
                }
        }
@@ -385,15 +391,6 @@ void can_bus_t::push_new_vehicle_message(const openxc_VehicleMessage& v_msg)
        vehicle_message_q_.push(v_msg);
 }
 
-/// @brief Create a RX_SETUP receive job for the BCM socket of a CAN signal.
-///
-/// @return 0 if ok -1 if not.
-       int can_bus_t::create_rx_filter(const can_signal_t& s)
-       {
-               const std::string& bus  = s.get_message().get_bus_name();
-               return can_bus_t::can_devices_[bus]->create_rx_filter(s);
-       }
-
 /// @brief Return a map with the can_bus_dev_t initialized
 ///
 /// @return map can_bus_dev_m_ map