X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flow-can-binding.cpp;h=79b169146f4f83734d8ee72da11fa05f38956c97;hb=b4d0643afdb3ad69298dac22e4b3380038f301af;hp=c5fadbe30aa1d1aa24dad6cfa8a97c6fd11b5062;hpb=15250b2e51e8383a0df4b6e5a870c07e914d406d;p=apps%2Fagl-service-can-low-level.git diff --git a/src/low-can-binding.cpp b/src/low-can-binding.cpp index c5fadbe3..79b16914 100644 --- a/src/low-can-binding.cpp +++ b/src/low-can-binding.cpp @@ -16,46 +16,32 @@ * limitations under the License. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "low-can-binding.hpp" + #include -#include -#include -#include +#include +#include #include -#include - +#include +#include #include -#include - -#include -#include +#include -#include "obd2.hpp" -#include "can-utils.hpp" -#include "can-signals.hpp" +#include "openxc.pb.h" +#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" -/* - * Interface between the daemon and the binding - */ -static const struct afb_binding_interface *interface; -static obd2_handler_t obd2_handler(); +extern "C" +{ + #include +}; -/******************************************************************************** -* -* Event management -* -*********************************************************************************/ +// Interface between the daemon and the binding +const struct afb_binding_interface *binder_interface; /******************************************************************************** * @@ -63,99 +49,102 @@ static obd2_handler_t obd2_handler(); * *********************************************************************************/ -static int subscribe_unsubscribe_signal(struct afb_req request, bool subscribe, std::vector::const_iterator& sig_i) +static int make_subscription_unsubscription(struct afb_req request, const std::string& sig_name, std::map& 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) + { + ERROR(binder_interface, "Operation goes wrong for signal: %s", sig_name); + return 0; + } + return 1; + +} + +static int create_event_handle(const std::string& sig_name, std::map& s) +{ + 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."); + return 0; + } + return 1; +} + +static int subscribe_unsubscribe_signal(struct afb_req request, bool subscribe, const std::string& sig) { int ret; - const auto& ss_i = subscribed_signals.find(sig_i); - if (ss_i != subscribed_signals.end()) + std::lock_guard subscribed_signals_lock(get_subscribed_signals_mutex()); + std::map& s = get_subscribed_signals(); + if (s.find(sig) != s.end() && !afb_event_is_valid(s[sig])) { - if(!afb_event_is_valid(ss_i->second)) + if(!subscribe) { - if(!subscribe) - { - NOTICE(interface, "Event isn't valid, it can't be unsubscribed."); - ret = 1; - } - else - { - ss_i->second = afb_daemon_make_event(interface->daemon, ss_i->first.genericName); - if (!afb_event_is_valid(ss_i->second)) - { - ERROR(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_i] = afb_daemon_make_event(interface->daemon, sig_i->genericName); - if (!afb_event_is_valid(ss_i->second)) + else { - ERROR(interface, "Can't create an event, something goes wrong."); - ret = 0; + /* Event it isn't valid annymore, recreate it */ + ret = create_event_handle(sig, s); } } - - if (((subscribe ? afb_req_subscribe : afb_req_unsubscribe)(request, subscribed_signals[sig_i])) < 0) + else { - ERROR(interface, "Operation goes wrong for signal: %s", sig_i->genericName); - ret = 0; + /* 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); } - 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, sig, s, subscribe); } -static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe, const std::vector& signals) +/** + * @fn static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe, const std::vector& 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 + * + * @return Number of correctly subscribed signal + */ +static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe, const std::vector& signals) { - int ret; + int rets = 0; - // TODO: lock the subscribed_signals when insert/remove - for(const auto& signal_i : signals) + for(auto& sig : signals) { - ret = subscribe_unsubscribe_signal(request, subscribe, signal_i); - if(ret == 0) + int ret = subscribe_unsubscribe_signal(request, subscribe, sig); + if(ret <= 0) return ret; + rets++; + DEBUG(binder_interface, "Signal: %s subscribed", sig.c_str()); } -} - -static int subscribe_unsubscribe_all(struct afb_req request, bool subscribe) -{ - int n, e; - - n = obd2_handler.OBD2_PIDS.size(); - e = 0; - for (const auto& pid : obd2_handler.OBD2_PIDS) - e += !subscribe_unsubscribe_signals(request, subscribe, pid); - - return e == 0; + return rets; } static int subscribe_unsubscribe_name(struct afb_req request, bool subscribe, const char *name) { - std::vector sig; + std::vector signals; int ret = 0; - if (!::strcmp(name, "*")) - ret = subscribe_unsubscribe_all(request, subscribe); - else - { - //if(obd2_handler_c.is_obd2_signal(name)) - if(false) - { - // TODO - } - else - { - sig = find_can_signals(name); - if (sig.empty()) - ret = 0; - } - ret = subscribe_unsubscribe_signals(request, subscribe, sig); - } + openxc_DynamicField search_key = build_DynamicField(std::string(name)); + signals = find_signals(search_key); + if (signals.empty()) + ret = 0; + + ret = subscribe_unsubscribe_signals(request, subscribe, signals); + NOTICE(binder_interface, "Subscribed correctly to %d/%d signal(s).", ret, (int)signals.size()); + return ret; } @@ -167,7 +156,7 @@ static void subscribe_unsubscribe(struct afb_req request, bool subscribe) /* makes the subscription/unsubscription */ args = afb_req_json(request); if (args == NULL || !json_object_object_get_ex(args, "event", &a)) { - ok = subscribe_unsubscribe_all(request, subscribe); + ok = subscribe_unsubscribe_name(request, subscribe, "*"); } else if (json_object_get_type(a) != json_type_array) { ok = subscribe_unsubscribe_name(request, subscribe, json_object_get_string(a)); } else { @@ -188,57 +177,60 @@ static void subscribe_unsubscribe(struct afb_req request, bool subscribe) afb_req_fail(request, "error", NULL); } -static void subscribe(struct afb_req request) -{ - subscribe_unsubscribe(request, true); -} - -static void unsubscribe(struct afb_req request) -{ - subscribe_unsubscribe(request, false); -} - -static const struct afb_verb_desc_v1 verbs[]= +extern "C" { - { .name= "subscribe", .session= AFB_SESSION_NONE, .callback= subscribe, .info= "subscribe to notification of CAN bus messages." }, - { .name= "unsubscribe", .session= AFB_SESSION_NONE, .callback= unsubscribe, .info= "unsubscribe a previous subscription." } -}; - -static const struct afb_binding binding_desc = { - .type = AFB_BINDING_VERSION_1, - .v1 = { - .info = "CAN bus service", - .prefix = "can", - .verbs = verbs + static void subscribe(struct afb_req request) + { + subscribe_unsubscribe(request, true); } -}; -const struct afb_binding *afbBindingV1Register (const struct afb_binding_interface *itf) -{ - interface = itf; + static void unsubscribe(struct afb_req request) + { + subscribe_unsubscribe(request, false); + } - return &binding_desc; -} + static const struct afb_verb_desc_v1 verbs[]= + { + { .name= "subscribe", .session= AFB_SESSION_NONE, .callback= subscribe, .info= "subscribe to notification of CAN bus messages." }, + { .name= "unsubscribe", .session= AFB_SESSION_NONE, .callback= unsubscribe, .info= "unsubscribe a previous subscription." } + }; -/** - * @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) -{ - std::ifstream fd_conf; - fd_conf = afb_daemon_rootdir_open_locale(interface->daemon, "can_bus.json", O_RDONLY, NULL); + static const struct afb_binding binding_desc { + AFB_BINDING_VERSION_1, + { + "Low level CAN bus service", + "low-can", + verbs + } + }; - /* Open CAN socket */ - can_bus_t can_bus_handler(interface, fd_conf); - if(can_bus_handler.init_can_dev() == 0) + const struct afb_binding *afbBindingV1Register (const struct afb_binding_interface *itf) { - can_bus_handler.start_threads(); - return 0; + binder_interface = itf; + + return &binding_desc; } - return 1; -} + /** + * @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) + { + configuration_t config; + + can_bus_manager = config.get_can_bus_manager(); + + /* Open CAN socket */ + if(can_bus_manager.init_can_dev() == 0) + { + 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; + } +};