X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flow-can-binding.cpp;h=ed1aa34c7ae274523c3e20aa25187386f92e25e7;hb=7b336475a398d37c4d5c4a534c87919263ae4b01;hp=4e58dd40fd939cdf4c624c69c585dfc334144f51;hpb=b157cc6c5942ed0dfae672d2d3e32e0d7c6cb2ad;p=apps%2Fagl-service-can-low-level.git diff --git a/src/low-can-binding.cpp b/src/low-can-binding.cpp index 4e58dd40..ed1aa34c 100644 --- a/src/low-can-binding.cpp +++ b/src/low-can-binding.cpp @@ -18,112 +18,165 @@ #include "low-can-binding.hpp" -/******************************************************************************** -* -* Event management -* -*********************************************************************************/ - -/******************************************************************************** -* -* Subscription and unsubscription -* -*********************************************************************************/ - -static int subscribe_unsubscribe_signal(struct afb_req request, bool subscribe, const CanSignal& sig) +#include +#include +#include +#include +#include +#include +#include +#include + +#include "openxc.pb.h" +#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 "diagnostic/diagnostic-message.hpp" +#include "utils/openxc-utils.hpp" + +extern "C" +{ + #include +}; + +// Interface between the daemon and the binding +const struct afb_binding_interface *binder_interface; + +///****************************************************************************** +/// +/// Subscription and unsubscription +/// +///*******************************************************************************/ + +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])) < 0) + { + ERROR(binder_interface, "make_subscription_unsubscription: Operation goes wrong for signal: %s", sig_name.c_str()); + 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, "create_event_handle: Can't create an event for %s, something goes wrong.", sig_name.c_str()); + return 0; + } + return 1; +} + +static int subscribe_unsubscribe_signal(struct afb_req request, bool subscribe, const std::string& 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 subscribed_signals_lock(get_subscribed_signals_mutex()); + std::map& s = get_subscribed_signals(); + if (s.find(sig) != s.end()) { - if(!afb_event_is_valid(ss_i->second)) + if (!afb_event_is_valid(s[sig]) && !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.c_str()); - if (!afb_event_is_valid(ss_i->second)) - { - ERROR(interface, "Can't create an event, something goes wrong."); - ret = 0; - } - } + NOTICE(binder_interface, "subscribe_unsubscribe_signal: Event isn't valid, it can't be unsubscribed."); + ret = -1; } + /*else + { + // Event it isn't valid annymore, recreate it + ret = create_event_handle(sig, s); + }*/ } else { - subscribed_signals[sig.genericName] = afb_daemon_make_event(interface->daemon, sig.genericName); - if (!afb_event_is_valid(ss_i->second)) - { - ERROR(interface, "Can't create an event, something goes wrong."); - 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); } - if (((subscribe ? afb_req_subscribe : afb_req_unsubscribe)(request, subscribed_signals[sig.genericName])) < 0) - { - ERROR(interface, "Operation goes wrong for signal: %s", sig.genericName); - ret = 0; - } - 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] 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, const std::vector& signals) { - int ret = 0; + int rets = 0; - for(const auto& signal_i : signals) + //TODO: Implement way to dynamically call the right function no matter + // how much signals types we have. + + for(const std::string& sig : signals) { - ret = subscribe_unsubscribe_signal(request, subscribe, signal_i); - if(ret == 0) - return ret; - } - return ret; -} + int ret; + if (active_diagnostic_request_t::is_diagnostic_signal(sig)) + { + std::vector found; + configuration_t::instance().find_diagnostic_messages(build_DynamicField(sig), found); + DiagnosticRequest* diag_req = new DiagnosticRequest(found.front()->build_diagnostic_request()); -static int subscribe_unsubscribe_all(struct afb_req request, bool subscribe) -{ - int e = 0; + // If the requested diagnostic message isn't supported by the car then unssubcribe. + // no matter what we want, worse case will be a fail unsubscription but at least we don't + // poll a PID for nothing. + if(found.front()->get_supported()) + { + float frequency = found.front()->get_frequency(); + configuration_t::instance().get_diagnostic_manager().add_recurring_request( + diag_req, sig.c_str(), false, found.front()->get_decoder(), found.front()->get_callback(), (float)frequency); + //TODO: Adding callback requesting ignition status: diag_req, sig.c_str(), false, diagnostic_message_t::decode_obd2_response, diagnostic_message_t::check_ignition_status, frequency); + } + else + { + configuration_t::instance().get_diagnostic_manager().cleanup_request( + configuration_t::instance().get_diagnostic_manager().find_recurring_request(diag_req), true); + DEBUG(binder_interface, "Signal: %s isn't supported. Canceling operation.", sig.c_str()); + return -1; + } + } - //for (const auto& sig : SIGNALS) - // e += !subscribe_unsubscribe_signals(request, subscribe, sig); - e += !subscribe_unsubscribe_signals(request, subscribe, SIGNALS[MESSAGE_SET_ID]); - - return e == 0; + ret = subscribe_unsubscribe_signal(request, subscribe, sig); + if(ret <= 0) + return ret; + + rets++; + 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 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 - { - openxc_DynamicField search_key = build_DynamicField(name); - sig = find_can_signals(search_key); - 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/unsubscribe correctly to %d/%d signal(s).", ret, (int)signals.size()); + return ret; } @@ -135,7 +188,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 { @@ -156,21 +209,6 @@ static void subscribe_unsubscribe(struct afb_req request, bool subscribe) afb_req_fail(request, "error", NULL); } -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." } -}; - -static const struct afb_binding binding_desc { - AFB_BINDING_VERSION_1, - { - "CAN bus service", - "can", - verbs - } -}; - extern "C" { static void subscribe(struct afb_req request) @@ -183,33 +221,50 @@ extern "C" subscribe_unsubscribe(request, false); } + 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." } + }; + + static const struct afb_binding binding_desc { + AFB_BINDING_VERSION_1, + { + "Low level CAN bus service", + "low-can", + verbs + } + }; + const struct afb_binding *afbBindingV1Register (const struct afb_binding_interface *itf) { - interface = itf; + binder_interface = itf; return &binding_desc; } - /** - * @brief Initialize the binding. - * - * @param[in] service Structure which represent the Application Framework Binder. - * - * @return Exit code, zero if success. - */ + /// @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) { - int fd_conf; - fd_conf = afb_daemon_rootdir_open_locale(interface->daemon, "can_bus.json", O_RDONLY, NULL); + can_bus_t& can_bus_manager = configuration_t::instance().get_can_bus_manager(); - /* Open CAN socket */ - can_bus_t can_bus_handler(interface, fd_conf); - if(can_bus_handler.init_can_dev() == 0) + /// Initialize CAN socket + if(can_bus_manager.init_can_dev() == 0) { - can_bus_handler.start_threads(); - return 0; + can_bus_manager.start_threads(); + + /// Initialize Diagnostic manager that will handle obd2 requests. + /// We pass by default the first CAN bus device to its Initialization. + /// TODO: be able to choose the CAN bus device that will be use as Diagnostic bus. + if(configuration_t::instance().get_diagnostic_manager().initialize()) + return 0; } + ERROR(binder_interface, "There was something wrong with CAN device Initialization. Check your config file maybe"); return 1; } -}; \ No newline at end of file +};