X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so.c;h=3730ccd6b042de9a4e4855d4b40502df10561d77;hb=5b5a2e4412eea806451c016da9fb285bc09c17ab;hp=9ab3e6214be47d5707c1ec63acc2aa220d7e0b57;hpb=fca2e14e1d57d7b89d1a6de07075cc0e6e157ca7;p=src%2Fapp-framework-binder.git diff --git a/src/afb-api-so.c b/src/afb-api-so.c index 9ab3e621..3730ccd6 100644 --- a/src/afb-api-so.c +++ b/src/afb-api-so.c @@ -16,6 +16,7 @@ */ #define _GNU_SOURCE +#define NO_PLUGIN_VERBOSE_MACRO #include #include @@ -29,7 +30,7 @@ #include #include -#include +#include #include "session.h" #include "afb-common.h" @@ -37,47 +38,84 @@ #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" +/* + * Description of a plugin + */ struct api_so_desc { struct AFB_plugin *plugin; /* descriptor */ - size_t apilength; + size_t apilength; /* length of the API name */ void *handle; /* context of dlopen */ - struct AFB_interface interface; /* interface */ + struct afb_svc *service; /* handler for service started */ + struct AFB_interface interface; /* interface for the plugin */ }; static int api_timeout = 15; -static const char plugin_register_function[] = "pluginAfbV1Register"; +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"; + +void afb_api_so_set_timeout(int to) +{ + api_timeout = to; +} -static void afb_api_so_event_sender_push(struct api_so_desc *desc, const char *name, struct json_object *object) +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); + + /* crate the event */ + return afb_evt_create_event(event); } -static const struct afb_event_sender_itf event_sender_itf = { - .push = (void*)afb_api_so_event_sender_push -}; +static int afb_api_so_event_broadcast(struct api_so_desc *desc, const char *name, struct json_object *object) +{ + size_t length; + char *event; -static struct afb_event_sender afb_api_so_get_event_sender(struct api_so_desc *desc) + /* 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) { - return (struct afb_event_sender){ .itf = &event_sender_itf, .closure = desc }; + char *p; + + if (vasprintf(&p, fmt, args) < 0) + vverbose(level, file, line, fmt, args); + else { + verbose(level, file, line, "%s {plugin %s}", p, desc->plugin->v1.prefix); + free(p); + } } static const struct afb_daemon_itf daemon_itf = { - .get_event_sender = (void*)afb_api_so_get_event_sender, + .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 + .get_system_bus = (void*)afb_common_get_system_bus, + .vverbose = (void*)afb_api_so_vverbose, + .event_make = (void*)afb_api_so_event_make }; struct monitoring { @@ -99,7 +137,7 @@ static void call_check(struct afb_req req, struct afb_context *context, const st int stag = (int)verb->session; - if (stag != (AFB_SESSION_CREATE|AFB_SESSION_CLOSE|AFB_SESSION_RENEW|AFB_SESSION_CHECK|AFB_SESSION_LOA_EQ)) { + if ((stag & (AFB_SESSION_CREATE|AFB_SESSION_CLOSE|AFB_SESSION_RENEW|AFB_SESSION_CHECK|AFB_SESSION_LOA_EQ)) != 0) { if (!afb_context_check(context)) { afb_context_close(context); afb_req_fail(req, "failed", "invalid token's identity"); @@ -158,6 +196,46 @@ 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; +} + int afb_api_so_add_plugin(const char *path) { int rc; @@ -174,7 +252,7 @@ int afb_api_so_add_plugin(const char *path) } /* retrieves the register function */ - pluginAfbV1RegisterFct = dlsym(handle, plugin_register_function); + pluginAfbV1RegisterFct = dlsym(handle, plugin_register_function_v1); if (!pluginAfbV1RegisterFct) { ERROR("plugin [%s] is not an AFB plugin", path); goto error2; @@ -191,12 +269,13 @@ int afb_api_so_add_plugin(const char *path) desc->handle = handle; /* init the interface */ - desc->interface.verbosity = 0; + desc->interface.verbosity = verbosity; desc->interface.mode = AFB_MODE_LOCAL; desc->interface.daemon.itf = &daemon_itf; desc->interface.daemon.closure = desc; /* init the plugin */ + NOTICE("plugin [%s] calling registering function %s", path, plugin_register_function_v1); desc->plugin = pluginAfbV1RegisterFct(&desc->interface); if (desc->plugin == NULL) { ERROR("plugin [%s] register function failed. continuing...", path); @@ -229,7 +308,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; }