X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flow-can-binding.cpp;h=87c94d54d6b37c95359459f37a2a4b08dc48ac26;hb=b0975e4bfa534153657a7ee8acaee0f950056e97;hp=b60989072f8a8ea958f9f8cd3cf89fc7f6953f5b;hpb=c2a2b12c1ec1a4e17a3c95ceb8f010ce961a909e;p=apps%2Fagl-service-can-low-level.git diff --git a/src/low-can-binding.cpp b/src/low-can-binding.cpp index b6098907..87c94d54 100644 --- a/src/low-can-binding.cpp +++ b/src/low-can-binding.cpp @@ -16,37 +16,25 @@ * limitations under the License. */ -#include -#include -#include -#include -#include -#include -#include -#include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "low-can-binding.hpp" -#include -#include +#include "can-utils.hpp" +#include "can-signals.hpp" +#include "openxc-utils.hpp" -#include "ll-can-binding.h" -#include "obd2.h" +extern "C" +{ + #include + #include +}; /* - * Interface between the daemon and the binding + * Interface between the daemon and the binding */ -static const struct afb_binding_interface *interface; +const struct afb_binding_interface *binder_interface; /******************************************************************************** * @@ -54,118 +42,110 @@ static const struct afb_binding_interface *interface; * *********************************************************************************/ -/* - * 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) -{ - openxc_CanMessage can_message; - - can_message = openxc_CanMessage_init_default; +/******************************************************************************** +* +* Subscription and unsubscription +* +*********************************************************************************/ - /* read available data */ - if ((revents & EPOLLIN) != 0) - { - read_can(&can_message); - send_event(); - } +static int subscribe_unsubscribe_signal(struct afb_req request, bool subscribe, const CanSignal& sig) +{ + int ret; - /* check if error or hangup */ - if ((revents & (EPOLLERR|EPOLLRDHUP|EPOLLHUP)) != 0) + // TODO: lock the subscribed_signals when insert/remove + const auto& ss_i = subscribed_signals.find(sig.genericName); + if (ss_i != subscribed_signals.end()) { - sd_event_source_unref(s); - close(fd); - connect_to_event_loop(); + if(!afb_event_is_valid(ss_i->second)) + { + 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; + } + } + } } - - return 0; -} - -/* - * 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) -{ - sd_event *event_loop; - sd_event_source *source; - int rc; - - if (CanBus_handler.socket < 0) + else { - return CanBus_handler.socket; + subscribed_signals[sig.genericName] = afb_daemon_make_event(binder_interface->daemon, sig.genericName); + if (!afb_event_is_valid(ss_i->second)) + { + ERROR(binder_interface, "Can't create an event, something goes wrong."); + ret = 0; + } } - 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) + if (((subscribe ? afb_req_subscribe : afb_req_unsubscribe)(request, subscribed_signals[sig.genericName])) < 0) { - CanBus_handler.close(); - ERROR(interface, "Can't connect CAN bus %s to the event loop", CanBus_handler.device); - } else - { - NOTICE(interface, "Connected CAN bus %s to the event loop", CanBus_handler.device); + ERROR(binder_interface, "Operation goes wrong for signal: %s", sig.genericName); + ret = 0; } - - return rc; + else + ret = 1; + + return ret; } - */ -/******************************************************************************** -* -* Subscription and unsubscription -* -*********************************************************************************/ - -static int subscribe_unsubscribe_sig(struct afb_req request, int subscribe, struct signal *sig) +static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe, const std::vector& signals) { - if (!afb_event_is_valid(sig->event)) { - if (!subscribe) - return 1; - sig->event = afb_daemon_make_event(afbitf->daemon, sig->name); - if (!afb_event_is_valid(sig->event)) { - return 0; - } - } + int ret = 0; - if (((subscribe ? afb_req_subscribe : afb_req_unsubscribe)(request, sig->event)) < 0) { - return 0; + for(const auto& signal_i : signals) + { + ret = subscribe_unsubscribe_signal(request, subscribe, signal_i); + if(ret == 0) + return ret; } - - return 1; + return ret; } -static int subscribe_unsubscribe_all(struct afb_req request, int subscribe) +static int subscribe_unsubscribe_all(struct afb_req request, bool subscribe) { - int i, n, e; + int e = 0; - n = sizeof OBD2_PIDS / sizeof * OBD2_PIDS; - e = 0; - for (i = 0 ; i < n ; i++) - e += !subscribe_unsubscribe_sig(request, subscribe, &OBD2_PIDS[i]); + //for (const auto& sig : SIGNALS) + // e += !subscribe_unsubscribe_signals(request, subscribe, sig); + e += !subscribe_unsubscribe_signals(request, subscribe, getSignals()); + return e == 0; } -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) { - struct signal *sig; - - if (0 == strcmp(name, "*")) - return subscribe_unsubscribe_all(request, subscribe); + std::vector sig; + int ret = 0; - sig = getSignal(name); - if (sig == NULL) { - return 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(binder_interface, search_key); + if (sig.empty()) + ret = 0; + } + ret = subscribe_unsubscribe_signals(request, subscribe, sig); } - - 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; @@ -194,60 +174,60 @@ 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 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." } + }; + + static const struct afb_binding binding_desc { + AFB_BINDING_VERSION_1, + { + "CAN bus service", + "can", + verbs + } + }; -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) + { + int fd_conf; + fd_conf = afb_daemon_rootdir_open_locale(binder_interface->daemon, "can_bus.json", O_RDONLY, NULL); + + /* 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; + } - /* Open CAN socket */ - CanBus_c CanBus_handler(interface, json_object_get_string(json_object_object_get(jo_canbus, "deviceName")); - CanBus_handler.open(); - CanBus_handler.start_threads(); -} + return 1; + } +};