X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so.c;h=168d9a6d5fea4b90b34d0350eb35217ed64d3347;hb=1131cbe80a0278dbfddca247162b6e51c86a3b8d;hp=abe100b0ef6a7e83032650928f822e4173701c16;hpb=645b2320fb04edda76e5761a439c865994f36b3a;p=src%2Fapp-framework-binder.git diff --git a/src/afb-api-so.c b/src/afb-api-so.c index abe100b0..168d9a6d 100644 --- a/src/afb-api-so.c +++ b/src/afb-api-so.c @@ -30,7 +30,7 @@ #include #include -#include +#include #include "session.h" #include "afb-common.h" @@ -38,6 +38,8 @@ #include "afb-apis.h" #include "afb-api-so.h" #include "afb-sig-handler.h" +#include "afb-evt.h" +#include "afb-svc.h" #include "verbose.h" /* @@ -47,34 +49,65 @@ struct api_so_desc { struct AFB_plugin *plugin; /* descriptor */ size_t apilength; /* length of the API name */ void *handle; /* context of dlopen */ + struct afb_svc *service; /* handler for service started */ struct AFB_interface interface; /* interface for the plugin */ }; -static int api_timeout = 15; +struct monitoring { + struct afb_req req; + void (*action)(struct afb_req); +}; static const char plugin_register_function_v1[] = "pluginAfbV1Register"; +static const char plugin_service_init_function_v1[] = "pluginAfbV1ServiceInit"; +static const char plugin_service_event_function_v1[] = "pluginAfbV1ServiceEvent"; + +static int api_timeout = 15; + +static struct afb_event afb_api_so_event_make(struct api_so_desc *desc, const char *name); +static int afb_api_so_event_broadcast(struct api_so_desc *desc, const char *name, struct json_object *object); +static void afb_api_so_vverbose(struct api_so_desc *desc, int level, const char *file, int line, const char *fmt, va_list args); -static void afb_api_so_event_sender_push(struct api_so_desc *desc, const char *name, struct json_object *object) +static const struct afb_daemon_itf daemon_itf = { + .event_broadcast = (void*)afb_api_so_event_broadcast, + .get_event_loop = (void*)afb_common_get_event_loop, + .get_user_bus = (void*)afb_common_get_user_bus, + .get_system_bus = (void*)afb_common_get_system_bus, + .vverbose = (void*)afb_api_so_vverbose, + .event_make = (void*)afb_api_so_event_make +}; + +static struct afb_event afb_api_so_event_make(struct api_so_desc *desc, const char *name) { size_t length; char *event; + /* makes the event name */ assert(desc->plugin != NULL); length = strlen(name); event = alloca(length + 2 + desc->apilength); memcpy(event, desc->plugin->v1.prefix, desc->apilength); event[desc->apilength] = '/'; memcpy(event + desc->apilength + 1, name, length + 1); - ctxClientEventSend(NULL, event, object); -} -static const struct afb_event_sender_itf event_sender_itf = { - .push = (void*)afb_api_so_event_sender_push -}; + /* crate the event */ + return afb_evt_create_event(event); +} -static struct afb_event_sender afb_api_so_get_event_sender(struct api_so_desc *desc) +static int afb_api_so_event_broadcast(struct api_so_desc *desc, const char *name, struct json_object *object) { - return (struct afb_event_sender){ .itf = &event_sender_itf, .closure = desc }; + size_t length; + char *event; + + /* makes the event name */ + assert(desc->plugin != NULL); + length = strlen(name); + event = alloca(length + 2 + desc->apilength); + memcpy(event, desc->plugin->v1.prefix, desc->apilength); + event[desc->apilength] = '/'; + memcpy(event + desc->apilength + 1, name, length + 1); + + return afb_evt_broadcast(event, object); } static void afb_api_so_vverbose(struct api_so_desc *desc, int level, const char *file, int line, const char *fmt, va_list args) @@ -89,19 +122,6 @@ static void afb_api_so_vverbose(struct api_so_desc *desc, int level, const char } } -static const struct afb_daemon_itf daemon_itf = { - .get_event_sender = (void*)afb_api_so_get_event_sender, - .get_event_loop = (void*)afb_common_get_event_loop, - .get_user_bus = (void*)afb_common_get_user_bus, - .get_system_bus = (void*)afb_common_get_system_bus, - .vverbose = (void*)afb_api_so_vverbose -}; - -struct monitoring { - struct afb_req req; - void (*action)(struct afb_req); -}; - static void monitored_call(int signum, struct monitoring *data) { if (signum != 0) @@ -175,6 +195,51 @@ static void call(struct api_so_desc *desc, struct afb_req req, struct afb_contex afb_req_fail_f(req, "unknown-verb", "verb %.*s unknown within api %s", (int)lenverb, verb, desc->plugin->v1.prefix); } +static int service_start(struct api_so_desc *desc, int share_session, int onneed) +{ + int (*init)(struct afb_service service); + void (*onevent)(const char *event, struct json_object *object); + + /* check state */ + if (desc->service != NULL) { + /* not an error when onneed */ + if (onneed != 0) + return 0; + + /* already started: it is an error */ + ERROR("Service %s already started", desc->plugin->v1.prefix); + return -1; + } + + /* get the initialisation */ + init = dlsym(desc->handle, plugin_service_init_function_v1); + if (init == NULL) { + /* not an error when onneed */ + if (onneed != 0) + return 0; + + /* no initialisation method */ + ERROR("Binding %s is not a service", desc->plugin->v1.prefix); + return -1; + } + + /* get the event handler if any */ + onevent = dlsym(desc->handle, plugin_service_event_function_v1); + desc->service = afb_svc_create(share_session, init, onevent); + if (desc->service == NULL) { + /* starting error */ + ERROR("Starting service %s failed", desc->plugin->v1.prefix); + return -1; + } + + return 0; +} + +void afb_api_so_set_timeout(int to) +{ + api_timeout = to; +} + int afb_api_so_add_plugin(const char *path) { int rc; @@ -247,7 +312,8 @@ int afb_api_so_add_plugin(const char *path) desc->apilength = strlen(desc->plugin->v1.prefix); if (afb_apis_add(desc->plugin->v1.prefix, (struct afb_api){ .closure = desc, - .call = (void*)call}) < 0) { + .call = (void*)call, + .service_start = (void*)service_start }) < 0) { ERROR("plugin [%s] can't be registered...", path); goto error3; }