diff options
author | Romain Forlot <romain.forlot@iot.bzh> | 2017-03-15 00:47:06 +0100 |
---|---|---|
committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-03-16 17:21:57 +0100 |
commit | a67c74b2f5e53e628f07846ca9c8acd42ac94794 (patch) | |
tree | ba312db18906fba723cf149f1105cdc5471afa51 /src/diagnostic/diagnostic-manager.hpp | |
parent | 29c259518cc53e2de8b2a082803c4ace40b1f754 (diff) |
Simplification of diagnostic manager. Delete uneeded vector
Control size manually, don't rely on STL container.
Change-Id: Iede2f9b233c5b8a6dc77c9b146ffc92da8e7a989
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'src/diagnostic/diagnostic-manager.hpp')
-rw-r--r-- | src/diagnostic/diagnostic-manager.hpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/diagnostic/diagnostic-manager.hpp b/src/diagnostic/diagnostic-manager.hpp index 061f5f9c..71662ba1 100644 --- a/src/diagnostic/diagnostic-manager.hpp +++ b/src/diagnostic/diagnostic-manager.hpp @@ -18,7 +18,6 @@ #pragma once #include <systemd/sd-event.h> -#include <queue> #include <vector> #include "uds/uds.h" @@ -54,17 +53,9 @@ private: * library (uds-c) into the VI's CAN peripheral.*/ std::shared_ptr<can_bus_dev_t> bus_; /*!< bus_ - A pointer to the CAN bus that should be used for all standard OBD-II requests, if the bus is not * explicitly spcified in the request. If NULL, all requests require an explicit bus.*/ - std::vector<active_diagnostic_request_t*> recurring_requests_; /*!< recurringRequests - A queue of active, recurring diagnostic requests. When - * a response is received for a recurring request or it times out, it is - * popped from the queue and pushed onto the back. */ + std::vector<active_diagnostic_request_t*> recurring_requests_; /*!< recurringRequests - A list of active recurring diagnostic requests.*/ std::vector<active_diagnostic_request_t*> non_recurring_requests_; /*!< nonrecurringRequests - A list of active one-time diagnostic requests. When a - * response is received for a non-recurring request or it times out, it is - * removed from this list and placed back in the free list.*/ - std::vector<active_diagnostic_request_t*> free_request_entries_; /*!< freeRequestEntries - A list of all available slots for active diagnostic - * requests. This free list is backed by statically allocated entries in - * the requestListEntries attribute.*/ - std::vector<active_diagnostic_request_t*> request_list_entries_; /*!< requestListEntries - Static allocation for all active diagnostic requests.*/ - + * response is received for a non-recurring request or it times out, it is removed*/ bool initialized_; /*!< * initialized - True if the DiagnosticsManager has been initialized with shims. It will interface with the uds-c lib*/ void init_diagnostic_shims(); @@ -75,7 +66,6 @@ public: bool initialize(std::shared_ptr<can_bus_dev_t> cbd); std::shared_ptr<can_bus_dev_t> get_can_bus_dev(); - active_diagnostic_request_t* get_free_entry(); DiagnosticShims& get_shims(); void find_and_erase(active_diagnostic_request_t* entry, std::vector<active_diagnostic_request_t*>& requests_list); |