X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flow-can-binding.cpp;h=f60790fc8e629e321da69098fdd6834ac5ee8632;hb=4e2d038c42d6995d69239455ec4fbad9931fcfd5;hp=d5c116f8882d4c06701cbbac4ed9127e55e7f336;hpb=ec95cbf8d430f9616eff050f510268f9901944b6;p=apps%2Flow-level-can-service.git diff --git a/src/low-can-binding.cpp b/src/low-can-binding.cpp index d5c116f..f60790f 100644 --- a/src/low-can-binding.cpp +++ b/src/low-can-binding.cpp @@ -16,178 +16,156 @@ * 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 "obd2.h" +#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 "obd2/obd2-signals.hpp" +#include "utils/openxc-utils.hpp" + +extern "C" +{ + #include +}; -/* - * Interface between the daemon and the binding - */ -static const struct afb_binding_interface *interface; +// Interface between the daemon and the binding +const struct afb_binding_interface *binder_interface; /******************************************************************************** * -* Event management +* Subscription and unsubscription * *********************************************************************************/ -/* - * TBF TBF TBF - * called on an event on the CAN bus - */ -static int on_event(sd_event_source *s, int fd, uint32_t revents, void *userdata) +static int make_subscription_unsubscription(struct afb_req request, const std::string& sig_name, std::map& s, bool subscribe) { - openxc_CanMessage can_message; - - can_message = openxc_CanMessage_init_default; - - /* read available data */ - if ((revents & EPOLLIN) != 0) + /* Make the subscription or unsubscription to the event */ + if (((subscribe ? afb_req_subscribe : afb_req_unsubscribe)(request, s[sig_name])) < 0) { - read_can(&can_message); - send_event(); + ERROR(binder_interface, "Operation goes wrong for signal: %s", sig_name.c_str()); + return 0; } + return 1; - /* check if error or hangup */ - if ((revents & (EPOLLERR|EPOLLRDHUP|EPOLLHUP)) != 0) +} + +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])) { - sd_event_source_unref(s); - close(fd); - connect_to_event_loop(); + ERROR(binder_interface, "Can't create an event for %s, something goes wrong.", sig_name.c_str()); + return 0; } - - return 0; + return 1; } -/* - * USELESS SINCE THREADS SEPARATION - * - * Get the event loop running. - * Will trigger on_event function on EPOLLIN event on socket - * - * Return 0 or positive value on success. Else negative value for failure. -static int connect_to_event_loop(CanBus &CanBus_handler) +static int subscribe_unsubscribe_signal(struct afb_req request, bool subscribe, const std::string& sig) { - sd_event *event_loop; - sd_event_source *source; - int rc; + int ret; - if (CanBus_handler.socket < 0) + 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])) { - return CanBus_handler.socket; + if(!subscribe) + { + NOTICE(binder_interface, "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); + } } - - event_loop = afb_daemon_get_event_loop(interface->daemon); - rc = sd_event_add_io(event_loop, &source, CanBus_handler.socket, EPOLLIN, on_event, NULL); - if (rc < 0) - { - CanBus_handler.close(); - ERROR(interface, "Can't connect CAN bus %s to the event loop", CanBus_handler.device); - } else + else { - NOTICE(interface, "Connected CAN bus %s to the event loop", CanBus_handler.device); + /* 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); } - return rc; + /* 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); } - */ - -/******************************************************************************** -* -* Subscription and unsubscription -* -*********************************************************************************/ - -static int subscribe_unsubscribe_signal(struct afb_req request, int subscribe, std::map::iterator *s_sig) - { - if (!afb_event_is_valid(s_sig->second)) { - if (!subscribe) - return 1; - sig->event = afb_daemon_make_event(afbitf->daemon, s_sig->first->genericName); - if (!afb_event_is_valid(s_sig->second)) { - return 0; - } - } - if (((subscribe ? afb_req_subscribe : afb_req_unsubscribe)(request, s_sig->second)) < 0) { - return 0; - } +/** + * @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 rets = 0; - return 1; - } + //TODO: Implement way to dynamically call the right function no matter + // how much signals types we have. -static int subscribe_unsubscribe_signals(struct afb_req request, int subscribe, std:vector *signals) -{ - std::vector::iterator signal_i; - std::map ::iterator s_signal_i; - - for(signal_i=signals.begin(); signal_i != signals.end(); signal_i++) + for(const std::string& sig : signals) { - s_signal_i = subscribed_signals.find(signal_i); - if(s_signal_i != subscribed_signals.end()) - subscribe_unsubscribe_signal(request, subscribe, s_signal_i); - else + int ret; + if (active_diagnostic_request_t::is_diagnostic_signal(sig) && subscribe) { - std::map ::iterator it = subscribed_signals.begin(); - it = subscribed_signals.insert(it, std::pair(signal_i, NULL); - subscribe_unsubscribe_signal(request, subscribe, it); + std::vector found; + configuration_t::instance().find_obd2_signals(build_DynamicField(sig), found); + int frequency = found.front()->get_frequency(); + DiagnosticRequest* diag_req = new DiagnosticRequest(found.front()->build_diagnostic_request()); + 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); } - return 0; - } -} -static int subscribe_unsubscribe_all(struct afb_req request, int subscribe) -{ - int i, n, e; + ret = subscribe_unsubscribe_signal(request, subscribe, sig); + if(ret <= 0) + return ret; - n = sizeof OBD2_PIDS / sizeof * OBD2_PIDS; - e = 0; - for (i = 0 ; i < n ; i++) - e += !subscribe_unsubscribe_sig(request, subscribe, &OBD2_PIDS[i]); - return e == 0; + rets++; + DEBUG(binder_interface, "Signal: %s subscribed", sig.c_str()); + } + return rets; } -static int subscribe_unsubscribe_name(struct afb_req request, int subscribe, const char *name) +static int subscribe_unsubscribe_name(struct afb_req request, bool subscribe, const char *name) { - std::vector *sig; + std::vector signals; + int ret = 0; - if (0 == strcmp(name, "*")) - return subscribe_unsubscribe_all(request, subscribe); + openxc_DynamicField search_key = build_DynamicField(std::string(name)); + signals = find_signals(search_key); + if (signals.empty()) + ret = 0; - if(obd2_handler_c.is_obd2_signal(name)) + ret = subscribe_unsubscribe_signals(request, subscribe, signals); + NOTICE(binder_interface, "Subscribed/unsubscribe correctly to %d/%d signal(s).", ret, (int)signals.size()); - else - find_can_signals(name, sig); - if (sig == NULL) { - return 0; - } - - return subscribe_unsubscribe_sig(request, subscribe, sig); + return ret; } -static void subscribe_unsubscribe(struct afb_req request, int subscribe) +static void subscribe_unsubscribe(struct afb_req request, bool subscribe) { int ok, i, n; struct json_object *args, *a, *x; @@ -195,7 +173,7 @@ static void subscribe_unsubscribe(struct afb_req request, int 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 { @@ -216,67 +194,62 @@ static void subscribe_unsubscribe(struct afb_req request, int subscribe) afb_req_fail(request, "error", NULL); } -static void subscribe(struct afb_req request) +extern "C" { - subscribe_unsubscribe(request, 1); -} - -static void unsubscribe(struct afb_req request) -{ - subscribe_unsubscribe(request, 0); -} -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." }, - {NULL} -}; + static void subscribe(struct afb_req request) + { + subscribe_unsubscribe(request, true); + } -static const struct afb_binding binding_desc = { - .type = AFB_BINDING_VERSION_1, - .v1 = { - .info = "CAN bus service", - .prefix = "can", - .verbs = verbs + static void unsubscribe(struct afb_req request) + { + subscribe_unsubscribe(request, false); } -}; -const struct afb_binding *afbBindingV1Register (const struct afb_binding_interface *itf) -{ - interface = itf; + 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." } + }; - return &binding_desc; -} + static const struct afb_binding binding_desc { + AFB_BINDING_VERSION_1, + { + "Low level CAN bus service", + "low-can", + verbs + } + }; -/** - * @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; - std::string fd_conf_content; - json_object jo_canbus; - - /* Open JSON conf file */ - jo_canbus = json_object_new_object(); - fd_conf = afb_daemon_rootdir_open_locale(interface->daemon, "canbus.json", O_RDONLY, NULL); - if (fd_conf) + const struct afb_binding *afbBindingV1Register (const struct afb_binding_interface *itf) { - fd_conf.seekg(0, std::ios::end); - fd_conf_content.resize(fd_conf.tellg()); - fd_conf.seekg(0, std::ios::beg); - fd_conf.read(&fd_conf_content[0], fd_conf_content.size()); - fd_conf.close(); + binder_interface = itf; + + return &binding_desc; } - jo_canbus = json_tokener_parse(&fd_conf_content); + /** + * @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) + { + can_bus_t& can_bus_manager = configuration_t::instance().get_can_bus_manager(); - /* Open CAN socket */ - can_bus_t CanBus_handler(interface, json_object_get_string(json_object_object_get(jo_canbus, "deviceName")); - CanBus_handler.open(); - CanBus_handler.start_threads(); -} + /// Initialize CAN socket + if(can_bus_manager.init_can_dev() == 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(can_bus_manager.get_can_devices().front())) + return 0; + + ERROR(binder_interface, "There was something wrong with CAN device Initialization. Check your config file maybe"); + return 1; + } +};