Changed the decoding function

[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 87c94d5..be2d373 100644 (file)
--- a/src/low-can-binding.cpp
+++ b/src/low-can-binding.cpp
@@ -16,18 +16,25 @@
  * limitations under the License.
  */
 
+#include "low-can-binding.hpp"
+
+#include <queue>
+#include <mutex>
+#include <vector>
+#include <thread>
+#include <fcntl.h>
+#include <linux/can.h>
 #include <json-c/json.h>
 #include <systemd/sd-event.h>
 
-#include "low-can-binding.hpp"
-
+#include "timer.hpp"
+#include "openxc.pb.h"
 #include "can-utils.hpp"
 #include "can-signals.hpp"
 #include "openxc-utils.hpp"
 
 extern "C"
 {
-       #include <afb/afb-binding.h>
        #include <afb/afb-service-itf.h>
 };
 
@@ -36,63 +43,69 @@ extern "C"
  */
 const struct afb_binding_interface *binder_interface;
 
-/********************************************************************************
-*
-*              Event management
-*
-*********************************************************************************/
-
 /********************************************************************************
 *
 *              Subscription and unsubscription
 *
 *********************************************************************************/
 
+static int make_subscription_unsubscription(struct afb_req request, std::map<std::string, struct afb_event>::iterator& ss_i, bool subscribe)
+{
+       /* Make the subscription or unsubscription to the event */
+       if (((subscribe ? afb_req_subscribe : afb_req_unsubscribe)(request, ss_i->second)) < 0)
+       {
+               ERROR(binder_interface, "Operation goes wrong for signal: %s", ss_i->first);
+               return 0;
+       }
+       return 1;
+
+}
+
+static int create_event_handle(std::map<std::string, struct afb_event>::iterator& ss_i)
+{
+       ss_i->second = afb_daemon_make_event(binder_interface->daemon, ss_i->first.c_str());
+       if (!afb_event_is_valid(ss_i->second)) 
+       {
+               ERROR(binder_interface, "Can't create an event, something goes wrong.");
+               return 0;
+       }
+
+       return 1;
+}
+
 static int subscribe_unsubscribe_signal(struct afb_req request, bool subscribe, const CanSignal& sig)
 {
        int ret;
 
-       // TODO: lock the subscribed_signals when insert/remove
-       const auto& ss_i = subscribed_signals.find(sig.genericName);
-       if (ss_i != subscribed_signals.end())
+       std::lock_guard<std::mutex> subscribed_signals_lock(subscribed_signals_mutex);
+       auto ss_i = subscribed_signals.find(sig.genericName);
+       if (ss_i != subscribed_signals.end() && !afb_event_is_valid(ss_i->second))
        {
-               if(!afb_event_is_valid(ss_i->second))
+               if(!subscribe)
                {
-                       if(!subscribe)
-                       {
-                               NOTICE(binder_interface, "Event isn't valid, it can't be unsubscribed.");
-                               ret = 1;
-                       }
-                       else
-                       {
-                               ss_i->second = afb_daemon_make_event(binder_interface->daemon, ss_i->first.c_str());
-                               if (!afb_event_is_valid(ss_i->second)) 
-                               {
-                                       ERROR(binder_interface, "Can't create an event, something goes wrong.");
-                                       ret = 0;
-                               }
-                       }
+                       NOTICE(binder_interface, "Event isn't valid, it can't be unsubscribed.");
+                       ret = -1;
                }
-       }
-       else
-       {
-               subscribed_signals[sig.genericName] = afb_daemon_make_event(binder_interface->daemon, sig.genericName);
-               if (!afb_event_is_valid(ss_i->second)) 
+               else
                {
-                       ERROR(binder_interface, "Can't create an event, something goes wrong.");
-                       ret = 0;
+                       /* Event it isn't valid annymore, recreate it */
+                       ret = create_event_handle(ss_i);
                }
        }
-
-       if (((subscribe ? afb_req_subscribe : afb_req_unsubscribe)(request, subscribed_signals[sig.genericName])) < 0)
+       else
        {
-               ERROR(binder_interface, "Operation goes wrong for signal: %s", sig.genericName);
-               ret = 0;
+               /* Event don't exist , so let's create it */
+               struct afb_event empty_event = {nullptr, nullptr};
+               auto ss_i = subscribed_signals.insert(std::make_pair(sig.genericName, empty_event));
+               ret = create_event_handle(ss_i.first);
        }
-       else
-               ret = 1;
-       
-       return ret;
+
+       /* Check whether or not the event handler has been correctly created and
+        * make the subscription/unsubscription operation is so.
+        */
+       if (ret <= 0)
+               return ret;
+       return make_subscription_unsubscription(request, ss_i, subscribe);
 }
 
 static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe, const std::vector<CanSignal>& signals)
@@ -136,7 +149,7 @@ static int subscribe_unsubscribe_name(struct afb_req request, bool subscribe, co
                else
                {
                        openxc_DynamicField search_key = build_DynamicField(name);
-                       sig = find_can_signals(binder_interface, search_key);
+                       sig = find_can_signals(search_key);
                        if (sig.empty())
                                ret = 0;
                }
@@ -220,14 +233,16 @@ extern "C"
                int fd_conf;
                fd_conf = afb_daemon_rootdir_open_locale(binder_interface->daemon, "can_bus.json", O_RDONLY, NULL);
 
+               /* Initialize the CAN bus handler */
+               can_bus_t can_bus_handler(fd_conf);
+
                /* Open CAN socket */
-               can_bus_t can_bus_handler(binder_interface, fd_conf);
                if(can_bus_handler.init_can_dev() == 0)
                {
                        can_bus_handler.start_threads();
                        return 0;
                }
-
+               ERROR(binder_interface, "There was something wrong with CAN device Initialization. Check your config file maybe");
                return 1;
        }
 };