Littles comments improvments

[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 7a19c62..f60790f 100644 (file)
--- a/src/low-can-binding.cpp
+++ b/src/low-can-binding.cpp
@@ -25,7 +25,6 @@
 #include <time.h>
 #include <linux/can.h>
 #include <json-c/json.h>
-#include <systemd/sd-event.h>
 
 #include "openxc.pb.h"
 #include "configuration.hpp"
@@ -42,8 +41,6 @@ extern "C"
        #include <afb/afb-service-itf.h>
 };
 
-#define MICRO 1000000
-
 // Interface between the daemon and the binding
 const struct afb_binding_interface *binder_interface;
 
@@ -56,9 +53,9 @@ const struct afb_binding_interface *binder_interface;
 static int make_subscription_unsubscription(struct afb_req request, const std::string& sig_name, std::map<std::string, struct afb_event>& s, bool subscribe)
 {
        /* Make the subscription or unsubscription to the event */
-       if (((subscribe ? afb_req_subscribe : afb_req_unsubscribe)(request, s[sig_name.c_str()])) < 0)
+       if (((subscribe ? afb_req_subscribe : afb_req_unsubscribe)(request, s[sig_name])) < 0)
        {
-               ERROR(binder_interface, "Operation goes wrong for signal: %s", sig_name);
+               ERROR(binder_interface, "Operation goes wrong for signal: %s", sig_name.c_str());
                return 0;
        }
        return 1;
@@ -70,7 +67,7 @@ static int create_event_handle(const std::string& sig_name, std::map<std::string
        s[sig_name] = afb_daemon_make_event(binder_interface->daemon, sig_name.c_str());
        if (!afb_event_is_valid(s[sig_name]))
        {
-               ERROR(binder_interface, "Can't create an event, something goes wrong.");
+               ERROR(binder_interface, "Can't create an event for %s, something goes wrong.", sig_name.c_str());
                return 0;
        }
        return 1;
@@ -124,15 +121,14 @@ static int subscribe_unsubscribe_signal(struct afb_req request, bool subscribe,
 static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe, const std::vector<std::string>& signals)
 {
        int rets = 0;
-       sd_event_source *source;
 
-       //TODO: Implement way to dynamically call the right function no matter 
+       //TODO: Implement way to dynamically call the right function no matter
        // how much signals types we have.
 
        for(const std::string& sig : signals)
        {
                int ret;
-               if (active_diagnostic_request_t::is_diagnostic_signal(sig))
+               if (active_diagnostic_request_t::is_diagnostic_signal(sig) && subscribe)
                {
                        std::vector<obd2_signal_t*> found;
                        configuration_t::instance().find_obd2_signals(build_DynamicField(sig), found);
@@ -141,8 +137,6 @@ static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe,
                        configuration_t::instance().get_diagnostic_manager().add_recurring_request(
                                diag_req, sig.c_str(), false, obd2_signal_t::decode_obd2_response, nullptr, (float)frequency);
                                //TODO: Adding callback requesting ignition status:     diag_req, sig.c_str(), false, obd2_signal_t::decode_obd2_response, obd2_signal_t::check_ignition_status, frequency);
-                       sd_event_add_time(afb_daemon_get_event_loop(binder_interface->daemon), &source, CLOCK_MONOTONIC, frequency*MICRO, 0,
-                                                               configuration_t::instance().get_diagnostic_manager().send_request, diag_req);
                }
 
                ret = subscribe_unsubscribe_signal(request, subscribe, sig);
@@ -166,7 +160,7 @@ static int subscribe_unsubscribe_name(struct afb_req request, bool subscribe, co
                ret = 0;
 
        ret = subscribe_unsubscribe_signals(request, subscribe, signals);
-       NOTICE(binder_interface, "Subscribed correctly to %d/%d signal(s).", ret, (int)signals.size());
+       NOTICE(binder_interface, "Subscribed/unsubscribe correctly to %d/%d signal(s).", ret, (int)signals.size());
 
        return ret;
 }
@@ -236,9 +230,9 @@ extern "C"
 
        /**
        * @brief Initialize the binding.
-       * 
+       *
        * @param[in] service Structure which represent the Application Framework Binder.
-       * 
+       *
        * @return Exit code, zero if success.
        */
        int afbBindingV1ServiceInit(struct afb_service service)