Rename method to have same everywhere

[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 199054b..4aeaeaf 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
@@ -33,7 +33,7 @@
 #define MICRO 1000000
 
 diagnostic_manager_t::diagnostic_manager_t()
-       : initialized_{false}
+       : initialized_{false}, event_source_{nullptr}
 {}
 
 /// @brief Diagnostic manager isn't initialized at launch but after
@@ -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,7 +82,7 @@ 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)
 {
        // Make sure that socket has been opened.
        if(! socket_)
@@ -135,7 +135,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();
 
@@ -185,6 +185,7 @@ void diagnostic_manager_t::shims_logger(const char* format, ...)
        vsnprintf(buffer, 256, format, args);
 
        DEBUG(binder_interface, "%s: %s", __FUNCTION__, buffer);
+       va_end(args);
 }
 
 /// @brief The type signature for a... OpenXC TODO: not used yet.
@@ -198,7 +199,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_);
 }
 
@@ -213,6 +214,16 @@ DiagnosticShims& diagnostic_manager_t::get_shims()
        return shims_;
 }
 
+bool diagnostic_manager_t::socket_close()
+{
+       if(non_recurring_requests_.empty() && recurring_requests_.empty())
+       {
+               socket_.close();
+               return true;
+       }
+       return false;
+}
+
 /// @brief Search for a specific active diagnostic request in the provided requests list
 /// and erase it from the vector. This is useful at unsubscription to clean up the list otherwize
 /// all received CAN messages will be passed to DiagnosticRequestHandle of all active diagnostic request
@@ -231,6 +242,8 @@ void diagnostic_manager_t::find_and_erase(active_diagnostic_request_t* entry, st
 void diagnostic_manager_t::cancel_request(active_diagnostic_request_t* entry)
 {
        entry->get_socket().close();
+       delete entry;
+       entry = nullptr;
 }
 
 /// @brief Cleanup a specific request if it isn't running and get complete. As it is almost
@@ -248,16 +261,17 @@ void diagnostic_manager_t::cleanup_request(active_diagnostic_request_t* entry, b
                        request_string, sizeof(request_string));
                if(force && entry->get_recurring())
                {
-                       find_and_erase(entry, recurring_requests_);
                        cancel_request(entry);
+                       find_and_erase(entry, recurring_requests_);
                        DEBUG(binder_interface, "%s: Cancelling completed, recurring request: %s", __FUNCTION__, request_string);
                }
-               else
+               else if (!entry->get_recurring())
                {
                        DEBUG(binder_interface, "%s: Cancelling completed, non-recurring request: %s", __FUNCTION__, request_string);
-                       find_and_erase(entry, non_recurring_requests_);
                        cancel_request(entry);
+                       find_and_erase(entry, non_recurring_requests_);
                }
+               socket_close();
        }
 }
 
@@ -268,12 +282,17 @@ void diagnostic_manager_t::cleanup_request(active_diagnostic_request_t* entry, b
 void diagnostic_manager_t::cleanup_active_requests(bool force)
 {
        for(auto& entry : non_recurring_requests_)
+       {
                if (entry != nullptr)
                        cleanup_request(entry, force);
+       }
 
        for(auto& entry : recurring_requests_)
+        {
                if (entry != nullptr)
                        cleanup_request(entry, force);
+        }
+
 }
 
 /// @brief Will return the active_diagnostic_request_t pointer for theDiagnosticRequest or nullptr if
@@ -288,10 +307,7 @@ active_diagnostic_request_t* diagnostic_manager_t::find_recurring_request(const
                if(entry != nullptr)
                {
                        if(diagnostic_request_equals(&entry->get_handle()->request, request))
-                       {
-                               return entry;
-                               break;
-                       }
+                               {return entry;}
                }
        }
        return nullptr;
@@ -323,7 +339,7 @@ active_diagnostic_request_t* diagnostic_manager_t::find_recurring_request(const
 /// @return true if the request was added successfully. Returns false if there
 /// wasn't a free active request entry, if the frequency was too high or if the
 /// CAN acceptance filters could not be configured,
-active_diagnostic_request_t* diagnostic_manager_t::add_request(DiagnosticRequest* request, const std::string name,
+active_diagnostic_request_t* diagnostic_manager_t::add_request(DiagnosticRequest* request, const std::string& name,
        bool wait_for_multiple_responses, const DiagnosticResponseDecoder decoder,
        const DiagnosticResponseCallback callback)
 {
@@ -441,7 +457,7 @@ 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)
+                       if(create_rx_filter(OBD2_FUNCTIONAL_BROADCAST_ID) < 0)
                                { recurring_requests_.pop_back(); }
                        else
                                {