X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=CAN-binder%2Flow-can-binding%2Fcan%2Fcan-bus.cpp;h=d06eb77c2c603ce1ad5d2ccd8115714a8aeaca1b;hb=5206b26e1a6811d142ffbaf12daaea0731345490;hp=c2968054b3ec6f829947b0107fd23995c6dabe8b;hpb=2d574dc77f68ecb5150016989900860e8b74be50;p=apps%2Fagl-service-can-low-level.git diff --git a/CAN-binder/low-can-binding/can/can-bus.cpp b/CAN-binder/low-can-binding/can/can-bus.cpp index c2968054..d06eb77c 100644 --- a/CAN-binder/low-can-binding/can/can-bus.cpp +++ b/CAN-binder/low-can-binding/can/can-bus.cpp @@ -29,15 +29,10 @@ #include "can-signals.hpp" #include "can-decoder.hpp" -#include "../binding/configuration.hpp" +#include "../binding/application.hpp" #include "../utils/signals.hpp" #include "../utils/openxc-utils.hpp" -extern "C" -{ - #include -} - /// @brief Class constructor /// /// @param[in] conf_file - handle to the json configuration file. @@ -45,6 +40,19 @@ can_bus_t::can_bus_t(utils::config_parser_t conf_file) : conf_file_{conf_file} {} +bool can_bus_t::apply_filter(const openxc_VehicleMessage& vehicle_message, std::shared_ptr can_subscription) +{ + 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(); + double value = get_numerical_from_DynamicField(vehicle_message); + send = (value < min && value > max) ? false : true; + } + return send; +} + /// @brief Will make the decoding operation on a classic CAN message. It will not /// handle CAN commands nor diagnostic messages that have their own method to get /// this happens. @@ -55,44 +63,29 @@ can_bus_t::can_bus_t(utils::config_parser_t conf_file) /// @param[in] can_message - a single CAN message from the CAN socket read, to be decode. /// /// @return How many signals has been decoded. -int can_bus_t::process_can_signals(const can_message_t& can_message) +void can_bus_t::process_can_signals(const can_message_t& can_message, std::map >& s) { - int processed_signals = 0; - struct utils::signals_found signals; - openxc_DynamicField search_key, decoded_message; + int subscription_id = can_message.get_sub_id(); + openxc_DynamicField decoded_message; openxc_VehicleMessage vehicle_message; - configuration_t& conf = configuration_t::instance(); - utils::signals_manager_t& sm = utils::signals_manager_t::instance(); // First we have to found which can_signal_t it is - search_key = build_DynamicField((double)can_message.get_id()); - signals = sm.find_signals(search_key); + std::shared_ptr sig = s[subscription_id]; - // Decoding the message ! Don't kill the messenger ! - for(const auto& sig : signals.can_signals) + if( s.find(subscription_id) != s.end() && afb_event_is_valid(s[subscription_id]->get_event())) { - std::lock_guard subscribed_signals_lock(sm.get_subscribed_signals_mutex()); - std::map& s = sm.get_subscribed_signals(); + bool send = true; + decoded_message = decoder_t::translateSignal(*sig->get_can_signal(), can_message, application_t::instance().get_all_can_signals(), &send); + openxc_SimpleMessage s_message = build_SimpleMessage(sig->get_name(), decoded_message); + vehicle_message = build_VehicleMessage(s_message, can_message.get_timestamp()); - if( s.find(sig->get_name()) != s.end() && afb_event_is_valid(s[sig->get_name()])) + if(send && apply_filter(vehicle_message, sig)) { - bool send = true; - decoded_message = decoder_t::translateSignal(*sig, can_message, conf.get_all_can_signals(), &send); - - if(send) - { - openxc_SimpleMessage s_message = build_SimpleMessage(sig->get_name(), decoded_message); - vehicle_message = build_VehicleMessage(s_message); - - std::lock_guard decoded_can_message_lock(decoded_can_message_mutex_); - push_new_vehicle_message(vehicle_message); - } - processed_signals++; + std::lock_guard decoded_can_message_lock(decoded_can_message_mutex_); + push_new_vehicle_message(subscription_id, vehicle_message); + DEBUG(binder_interface, "%s: %s CAN signals processed.", __FUNCTION__, sig->get_name().c_str()); } } - - DEBUG(binder_interface, "%s: %d/%d CAN signals processed.", __FUNCTION__, processed_signals, (int)signals.can_signals.size()); - return processed_signals; } /// @brief Will make the decoding operation on a diagnostic CAN message.Then it find the subscribed signal @@ -103,25 +96,21 @@ int can_bus_t::process_can_signals(const can_message_t& can_message) /// @param[in] can_message - a single CAN message from the CAN socket read, to be decode. /// /// @return How many signals has been decoded. -int can_bus_t::process_diagnostic_signals(diagnostic_manager_t& manager, const can_message_t& can_message) +void can_bus_t::process_diagnostic_signals(diagnostic_manager_t& manager, const can_message_t& can_message, std::map >& s) { - int processed_signals = 0; - - utils::signals_manager_t& sm = utils::signals_manager_t::instance(); - - std::lock_guard subscribed_signals_lock(sm.get_subscribed_signals_mutex()); - std::map& s = sm.get_subscribed_signals(); + int subscription_id = can_message.get_sub_id(); openxc_VehicleMessage vehicle_message = manager.find_and_decode_adr(can_message); if( (vehicle_message.has_simple_message && vehicle_message.simple_message.has_name) && - (s.find(vehicle_message.simple_message.name) != s.end() && afb_event_is_valid(s[vehicle_message.simple_message.name]))) + s.find(subscription_id) != s.end() && afb_event_is_valid(s[subscription_id]->get_event())) { - std::lock_guard decoded_can_message_lock(decoded_can_message_mutex_); - push_new_vehicle_message(vehicle_message); - processed_signals++; + if (apply_filter(vehicle_message, s[subscription_id])) + { + std::lock_guard decoded_can_message_lock(decoded_can_message_mutex_); + push_new_vehicle_message(subscription_id, vehicle_message); + DEBUG(binder_interface, "%s: %s CAN signals processed.", __FUNCTION__, s[subscription_id]->get_name().c_str()); + } } - - return processed_signals; } /// @brief thread to decoding raw CAN messages. @@ -138,24 +127,29 @@ int can_bus_t::process_diagnostic_signals(diagnostic_manager_t& manager, const c /// TODO: make diagnostic messages parsing optionnal. void can_bus_t::can_decode_message() { - can_message_t can_message; + utils::signals_manager_t& sm = utils::signals_manager_t::instance(); while(is_decoding_) { + std::unique_lock can_message_lock(can_message_mutex_); + new_can_message_cv_.wait(can_message_lock); + while(!can_message_q_.empty()) { - std::unique_lock can_message_lock(can_message_mutex_); - new_can_message_cv_.wait(can_message_lock); - while(!can_message_q_.empty()) - { - can_message = next_can_message(); + const can_message_t can_message = next_can_message(); + can_message_lock.unlock(); - if(configuration_t::instance().get_diagnostic_manager().is_diagnostic_response(can_message)) - process_diagnostic_signals(configuration_t::instance().get_diagnostic_manager(), can_message); + { + std::lock_guard subscribed_signals_lock(sm.get_subscribed_signals_mutex()); + std::map >& s = sm.get_subscribed_signals(); + if(application_t::instance().get_diagnostic_manager().is_diagnostic_response(can_message)) + {process_diagnostic_signals(application_t::instance().get_diagnostic_manager(), can_message, s);} else - process_can_signals(can_message); + {process_can_signals(can_message, s);} } + can_message_lock.lock(); } - new_decoded_can_message_.notify_one(); + new_decoded_can_message_.notify_one(); + can_message_lock.unlock(); } } @@ -163,7 +157,6 @@ void can_bus_t::can_decode_message() /// which are events that has to be pushed. void can_bus_t::can_event_push() { - openxc_VehicleMessage v_message; openxc_SimpleMessage s_message; json_object* jo; utils::signals_manager_t& sm = utils::signals_manager_t::instance(); @@ -174,21 +167,28 @@ void can_bus_t::can_event_push() new_decoded_can_message_.wait(decoded_can_message_lock); while(!vehicle_message_q_.empty()) { - v_message = next_vehicle_message(); - - s_message = get_simple_message(v_message); + std::pair v_message = next_vehicle_message(); + decoded_can_message_lock.unlock(); { std::lock_guard subscribed_signals_lock(sm.get_subscribed_signals_mutex()); - std::map& s = sm.get_subscribed_signals(); - if(s.find(std::string(s_message.name)) != s.end() && afb_event_is_valid(s[std::string(s_message.name)])) + std::map >& s = sm.get_subscribed_signals(); + s_message = get_simple_message(v_message.second); + if(s.find(v_message.first) != s.end() && afb_event_is_valid(s[v_message.first]->get_event())) { jo = json_object_new_object(); jsonify_simple(s_message, jo); - if(afb_event_push(s[std::string(s_message.name)], jo) == 0) - on_no_clients(std::string(s_message.name)); + if(afb_event_push(s[v_message.first]->get_event(), jo) == 0) + { + if(v_message.second.has_diagnostic_response) + {on_no_clients(s[v_message.first], v_message.second.diagnostic_response.pid, s);} + else + {on_no_clients(s[v_message.first], s);} + } } } + decoded_can_message_lock.lock(); } + decoded_can_message_lock.unlock(); } } @@ -198,13 +198,11 @@ void can_bus_t::start_threads() { is_decoding_ = true; th_decoding_ = std::thread(&can_bus_t::can_decode_message, this); - if(!th_decoding_.joinable()) - is_decoding_ = false; + th_decoding_.detach(); is_pushing_ = true; th_pushing_ = std::thread(&can_bus_t::can_event_push, this); - if(!th_pushing_.joinable()) - is_pushing_ = false; + th_pushing_.detach(); } /// @brief Will stop all threads holded by can_bus_t object @@ -235,7 +233,7 @@ std::mutex& can_bus_t::get_can_message_mutex() /// @brief Return first can_message_t on the queue /// /// @return a can_message_t -can_message_t can_bus_t::next_can_message() +const can_message_t can_bus_t::next_can_message() { can_message_t can_msg; @@ -262,9 +260,9 @@ void can_bus_t::push_new_can_message(const can_message_t& can_msg) /// @brief Return first openxc_VehicleMessage on the queue /// /// @return a openxc_VehicleMessage containing a decoded can message -openxc_VehicleMessage can_bus_t::next_vehicle_message() +std::pair can_bus_t::next_vehicle_message() { - openxc_VehicleMessage v_msg; + std::pair v_msg; if(! vehicle_message_q_.empty()) { @@ -280,9 +278,9 @@ openxc_VehicleMessage can_bus_t::next_vehicle_message() /// @brief Push a openxc_VehicleMessage into the queue /// /// @param[in] v_msg - const reference openxc_VehicleMessage object to push into the queue -void can_bus_t::push_new_vehicle_message(const openxc_VehicleMessage& v_msg) +void can_bus_t::push_new_vehicle_message(int subscription_id, const openxc_VehicleMessage& v_msg) { - vehicle_message_q_.push(v_msg); + vehicle_message_q_.push(std::make_pair(subscription_id, v_msg)); } /// @brief Return the shared pointer on the can_bus_dev_t initialized @@ -326,4 +324,4 @@ const std::string can_bus_t::get_can_device_name(const std::string& id_name) con } } return ret; -} \ No newline at end of file +}