Changing to a raw pointer can_bus_dev member and add

[apps/agl-service-can-low-level.git] / src / low-can-binding.cpp

diff --git a/src/low-can-binding.cpp b/src/low-can-binding.cpp
index b9fb27d..9357490 100644 (file)
--- a/src/low-can-binding.cpp
+++ b/src/low-can-binding.cpp
@@ -22,30 +22,27 @@
 #include <mutex>
 #include <vector>
 #include <thread>
-#include <fcntl.h>
 #include <linux/can.h>
 #include <json-c/json.h>
 #include <systemd/sd-event.h>
 
-#include "timer.hpp"
-#include "signals.hpp"
-#include "can-bus.hpp"
 #include "openxc.pb.h"
-#include "can-signals.hpp"
-#include "can-message.hpp"
-#include "openxc-utils.hpp"
+#include "configuration.hpp"
+#include "can/can-bus.hpp"
+#include "can/can-signals.hpp"
+#include "can/can-message.hpp"
+#include "utils/timer.hpp"
+#include "utils/signals.hpp"
+#include "utils/openxc-utils.hpp"
 
 extern "C"
 {
        #include <afb/afb-service-itf.h>
 };
 
-/*
- *     Interface between the daemon and the binding
- */
+// Interface between the daemon and the binding
 const struct afb_binding_interface *binder_interface;
-
-can_bus_t *can_bus_handler;
+configuration_t *config;
 
 /********************************************************************************
 *
@@ -82,7 +79,7 @@ static int subscribe_unsubscribe_signal(struct afb_req request, bool subscribe,
 
        std::lock_guard<std::mutex> subscribed_signals_lock(get_subscribed_signals_mutex());
        std::map<std::string, struct afb_event>& s = get_subscribed_signals();
-       if (s.find(sig) != s.end() && !afb_event_is_valid(s[std::string(sig)]))
+       if (s.find(sig) != s.end() && !afb_event_is_valid(s[sig]))
        {
                if(!subscribe)
                {
@@ -90,12 +87,14 @@ static int subscribe_unsubscribe_signal(struct afb_req request, bool subscribe,
                        ret = -1;
                }
                else
+               {
                        /* Event it isn't valid annymore, recreate it */
                        ret = create_event_handle(sig, s);
+               }
        }
        else
        {
-               /* Event don't exist , so let's create it */
+               /* Event doesn't exist , so let's create it */
                struct afb_event empty_event = {nullptr, nullptr};
                subscribed_signals[sig] = empty_event;
                ret = create_event_handle(sig, s);
@@ -110,42 +109,42 @@ static int subscribe_unsubscribe_signal(struct afb_req request, bool subscribe,
 }
 
 /**
- * @fn static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe, const std::vector<CanSignal>& signals)
+ * @fn static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe, const std::vector<can_signal_t>& signals)
  * @brief subscribe to all signals in the vector signals
  *
  * @param[in] afb_req request : contain original request use to subscribe or unsubscribe
  * @param[in] subscribe boolean value used to chose between a subscription operation or an unsubscription
- * @param[in] CanSignal  vector with CanSignal to subscribe
+ * @param[in] can_signal_t  vector with can_signal_t to subscribe
  *
  * @return Number of correctly subscribed signal
  */
-static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe, std::vector<std::string>& signals)
+static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe, const std::vector<std::string>& signals)
 {
        int rets = 0;
 
-       for(auto& signal_i : signals)
+       for(auto& sig : signals)
        {
-               int ret = subscribe_unsubscribe_signal(request, subscribe, signal_i);
+               int ret = subscribe_unsubscribe_signal(request, subscribe, sig);
                if(ret <= 0)
                        return ret;
                rets++;
-               DEBUG(binder_interface, "Signal: %s subscribed", signal_i.c_str());
+               DEBUG(binder_interface, "Signal: %s subscribed", sig.c_str());
        }
        return rets;
 }
 
 static int subscribe_unsubscribe_name(struct afb_req request, bool subscribe, const char *name)
 {
-       std::vector<std::string> sig;
+       std::vector<std::string> signals;
        int ret = 0;
 
        openxc_DynamicField search_key = build_DynamicField(std::string(name));
-       sig = find_signals(search_key);
-       if (sig.empty())
+       signals = find_signals(search_key);
+       if (signals.empty())
                ret = 0;
 
-       ret = subscribe_unsubscribe_signals(request, subscribe, sig);
-       NOTICE(binder_interface, "Subscribed correctly to %d/%d signal(s).", ret, (int)sig.size());
+       ret = subscribe_unsubscribe_signals(request, subscribe, signals);
+       NOTICE(binder_interface, "Subscribed correctly to %d/%d signal(s).", ret, (int)signals.size());
 
        return ret;
 }
@@ -222,18 +221,17 @@ extern "C"
        */
        int afbBindingV1ServiceInit(struct afb_service service)
        {
-               int fd_conf;
-               fd_conf = afb_daemon_rootdir_open_locale(binder_interface->daemon, "can_buses.json", O_RDONLY, NULL);
+               config = new configuration_t();
 
-               /* Initialize the CAN bus handler */
-               can_bus_handler = new can_bus_t(fd_conf);
+               can_bus_t& can_bus_manager = config->get_can_bus_manager();
 
                /* Open CAN socket */
-               if(can_bus_handler->init_can_dev() == 0)
+               if(can_bus_manager.init_can_dev() == 0)
                {
-                       can_bus_handler->start_threads();
+                       can_bus_manager.start_threads();
                        return 0;
                }
+
                ERROR(binder_interface, "There was something wrong with CAN device Initialization. Check your config file maybe");
                return 1;
        }