Adding DEBUG messages to track error on STL container

[apps/agl-service-can-low-level.git] / src / can-signals.hpp

diff --git a/src/can-signals.hpp b/src/can-signals.hpp
index 92dfe72..a95b3a3 100644 (file)
--- a/src/can-signals.hpp
+++ b/src/can-signals.hpp
@@ -36,18 +36,17 @@ extern "C"
 
 #define MESSAGE_SET_ID 0
 
-/** 
- * @brief Can signal event map making access to afb_event
- * externaly to an openxc existing structure.
- *
- * @desc Event map is making relation between CanSignal generic name
- * and the afb_event struct used by application framework to pushed
- * to the subscriber.
- */
-static std::map<std::string, struct afb_event> subscribed_signals;
-
+extern std::mutex subscribed_signals_mutex;
 std::mutex& get_subscribed_signals_mutex();
 
+/**
+ * @brief return the subscribed_signals map.
+ * 
+ * return std::map<std::string, struct afb_event> - map of subscribed signals.
+ */
+extern std::map<std::string, struct afb_event> subscribed_signals;
+std::map<std::string, struct afb_event>& get_subscribed_signals();
+
 /**
  * @brief The type signature for a CAN signal decoder.
  *
@@ -133,39 +132,13 @@ struct CanSignal {
 };
 typedef struct CanSignal CanSignal;
 
-/** Public: Return the currently active CAN configuration. */
-CanMessageSet* getActiveMessageSet();
-
-/** Public: Retrive a list of all possible CAN configurations.
- *
- * Returns a pointer to an array of all configurations.
- */
-CanMessageSet* getMessageSets();
-
-/** Public: Return the length of the array returned by getMessageSets() */
-int getMessageSetCount();
-
-/* Public: Return the number of CAN buses configured in the active
- * configuration. This is limited to 2, as the hardware controller only has 2
- * CAN channels.
- */
-int getCanBusCount();
-
-/* Public: Return an array of all CAN messages to be processed in the active
- * configuration.
- */
-CanMessageDefinition* getMessages();
-
 /* Public: Return signals from an signals array filtered on name.
  */
-const std::vector<CanSignal> getSignals();
+const std::vector<CanSignal>& getSignals();
 
 /* Public: Return the length of the array returned by getSignals(). */
 size_t getSignalCount();
 
-/* Public: Return the length of the array returned by getMessages(). */
-int getMessageCount();
-
 /**
  * @brief Find one or many signals based on its name or id
  * passed through openxc_DynamicField.
@@ -184,11 +157,4 @@ std::vector<CanSignal> find_can_signals(const openxc_DynamicField &key);
  *
  * @return uint32_t - unsigned integer representing the arbitration id.
  */
-inline uint32_t get_CanSignal_id(const CanSignal& sig);
-
-/**
- * @brief return the subscribed_signals map.
- * 
- * return std::map<std::string, struct afb_event> - map of subscribed signals.
- */
-const std::map<std::string, struct afb_event> get_subscribed_signals();
\ No newline at end of file
+inline uint32_t get_CanSignal_id(const CanSignal& sig);
\ No newline at end of file