Delete for good obsolete code

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

diff --git a/src/low-can-binding.cpp b/src/low-can-binding.cpp
index 2151790..24d1457 100644 (file)
--- a/src/low-can-binding.cpp
+++ b/src/low-can-binding.cpp
@@ -19,6 +19,7 @@
 #include "low-can-binding.hpp"
 
 #include <queue>
+#include <mutex>
 #include <vector>
 #include <thread>
 #include <fcntl.h>
@@ -28,13 +29,13 @@
 
 #include "timer.hpp"
 #include "openxc.pb.h"
-#include "can-utils.hpp"
+#include "can-bus.hpp"
 #include "can-signals.hpp"
+#include "can-message.hpp"
 #include "openxc-utils.hpp"
 
 extern "C"
 {
-       #include <afb/afb-binding.h>
        #include <afb/afb-service-itf.h>
 };
 
@@ -43,13 +44,6 @@ extern "C"
  */
 const struct afb_binding_interface *binder_interface;
 
-/*
- * CAN bus handler pointer. This is the object that will be use to
- * initialize each CAN devices specified into the configuration file
- *
- * It is used by the reading thread also because of its can_message_q_ queue
- * that store CAN messages read from the socket.
- */
 can_bus_t *can_bus_handler;
 
 /********************************************************************************
@@ -86,7 +80,7 @@ static int subscribe_unsubscribe_signal(struct afb_req request, bool subscribe,
 {
        int ret;
 
-       // TODO: lock the subscribed_signals when insert/remove
+       std::lock_guard<std::mutex> subscribed_signals_lock(get_subscribed_signals_mutex());
        auto ss_i = subscribed_signals.find(sig.genericName);
        if (ss_i != subscribed_signals.end() && !afb_event_is_valid(ss_i->second))
        {
@@ -217,8 +211,8 @@ extern "C"
        static const struct afb_binding binding_desc {
                AFB_BINDING_VERSION_1,
                {
-                       "CAN bus service",
-                       "can",
+                       "Low level CAN bus service",
+                       "low-can",
                        verbs
                }
        };
@@ -240,11 +234,10 @@ extern "C"
        int afbBindingV1ServiceInit(struct afb_service service)
        {
                int fd_conf;
-               fd_conf = afb_daemon_rootdir_open_locale(binder_interface->daemon, "can_bus.json", O_RDONLY, NULL);
+               fd_conf = afb_daemon_rootdir_open_locale(binder_interface->daemon, "can_buses.json", O_RDONLY, NULL);
 
                /* Initialize the CAN bus handler */
-               can_bus_t cbh(fd_conf);
-               can_bus_handler = &cbh;
+               can_bus_handler = new can_bus_t(fd_conf);
 
                /* Open CAN socket */
                if(can_bus_handler->init_can_dev() == 0)