Better handling of duplicate non recurring request

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

diff --git a/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.cpp b/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.cpp
index 31a3d23..f9dc960 100644 (file)
--- a/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.cpp
+++ b/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.cpp
@@ -23,7 +23,7 @@
 
 #include "../utils/openxc-utils.hpp"
 #include "../utils/signals.hpp"
-#include "../binding/configuration.hpp"
+#include "../binding/application.hpp"
 
 #define MAX_RECURRING_DIAGNOSTIC_FREQUENCY_HZ 10
 #define MAX_SIMULTANEOUS_DIAG_REQUESTS 50
@@ -46,7 +46,7 @@ diagnostic_manager_t::diagnostic_manager_t()
 bool diagnostic_manager_t::initialize()
 {
        // Mandatory to set the bus before intialize shims.
-       bus_ = configuration_t::instance().get_diagnostic_bus();
+       bus_ = application_t::instance().get_diagnostic_bus();
 
        init_diagnostic_shims();
        event_source_ = nullptr;
@@ -82,16 +82,17 @@ void diagnostic_manager_t::reset()
 ///  listens on CAN ID range 7E8 - 7EF affected to the OBD2 communications.
 ///
 /// @return -1 or negative value on error, 0 if ok.
-int diagnostic_manager_t::add_rx_filter(uint32_t can_id)
+int diagnostic_manager_t::create_rx_filter(uint32_t can_id, float frequency)
 {
        // Make sure that socket has been opened.
        if(! socket_)
                socket_.open(get_bus_device_name());
 
        struct utils::simple_bcm_msg bcm_msg;
-       memset(&bcm_msg.msg_head, 0, sizeof(bcm_msg.msg_head));
+       memset(&bcm_msg, 0, sizeof(bcm_msg));
 
-       const struct timeval freq =  recurring_requests_.back()->get_timeout_clock().get_timeval_from_period();
+       const struct timeval freq =  (frequency == recurring_requests_.back()->get_frequency_clock().get_frequency() ) ?
+               recurring_requests_.back()->get_frequency_clock().get_timeval_from_period() : frequency_clock_t(frequency).get_timeval_from_period();
 
        bcm_msg.msg_head.opcode  = RX_SETUP;
        bcm_msg.msg_head.flags = SETTIMER|RX_FILTER_ID;
@@ -135,7 +136,7 @@ int diagnostic_manager_t::add_rx_filter(uint32_t can_id)
 /// @return true if the CAN message was sent successfully. 
 bool diagnostic_manager_t::shims_send(const uint32_t arbitration_id, const uint8_t* data, const uint8_t size)
 {
-       diagnostic_manager_t& dm = configuration_t::instance().get_diagnostic_manager();
+       diagnostic_manager_t& dm = application_t::instance().get_diagnostic_manager();
        active_diagnostic_request_t* current_adr = dm.get_last_recurring_requests();
        utils::socketcan_bcm_t& tx_socket = current_adr->get_socket();
 
@@ -199,7 +200,7 @@ const std::string diagnostic_manager_t::get_bus_name() const
 
 const std::string diagnostic_manager_t::get_bus_device_name() const
 {
-       return configuration_t::instance().get_can_bus_manager()
+       return application_t::instance().get_can_bus_manager()
                .get_can_device_name(bus_);
 }
 
@@ -292,7 +293,6 @@ void diagnostic_manager_t::cleanup_active_requests(bool force)
                if (entry != nullptr)
                        cleanup_request(entry, force);
         }
-
 }
 
 /// @brief Will return the active_diagnostic_request_t pointer for theDiagnosticRequest or nullptr if
@@ -359,7 +359,8 @@ active_diagnostic_request_t* diagnostic_manager_t::add_request(DiagnosticRequest
                        diagnostic_request_to_string(&entry->get_handle()->request, request_string,
                                        sizeof(request_string));
 
-                       find_and_erase(entry, non_recurring_requests_);
+                       // Erase any existing request not already cleaned.
+                       cleanup_request(entry, true);
                        DEBUG(binder_interface, "%s: Added one-time diagnostic request on bus %s: %s", __FUNCTION__,
                                        bus_.c_str(), request_string);
 
@@ -457,8 +458,12 @@ active_diagnostic_request_t* diagnostic_manager_t::add_recurring_request(Diagnos
                        recurring_requests_.push_back(entry);
 
                        entry->set_handle(shims_, request);
-                       if(add_rx_filter(OBD2_FUNCTIONAL_BROADCAST_ID) < 0)
-                               { recurring_requests_.pop_back(); }
+                       if(create_rx_filter(OBD2_FUNCTIONAL_BROADCAST_ID, frequencyHz) < 0)
+                       {
+                               recurring_requests_.pop_back();
+                               delete entry;
+                               entry = nullptr;
+                       }
                        else
                                {
                                        start_diagnostic_request(&shims_, entry->get_handle());