X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so-v2.c;h=2d939fbcb17d7c1018427499b1dba766261172be;hb=69d7968b9713dafa23268ee34516e50133ca8b36;hp=401aa5cd9c05cd293730a650b92d8f74743d7546;hpb=0b838a6101edc810098ee0645d3bfd966096ae07;p=src%2Fapp-framework-binder.git diff --git a/src/afb-api-so-v2.c b/src/afb-api-so-v2.c index 401aa5cd..2d939fbc 100644 --- a/src/afb-api-so-v2.c +++ b/src/afb-api-so-v2.c @@ -24,8 +24,10 @@ #include -#include "afb-apis.h" +#include "afb-api.h" +#include "afb-apiset.h" #include "afb-svc.h" +#include "afb-ditf.h" #include "afb-evt.h" #include "afb-common.h" #include "afb-context.h" @@ -43,87 +45,11 @@ static const char afb_api_so_v2_descriptor[] = "afbBindingV2"; */ struct api_so_v2 { struct afb_binding_v2 *binding; /* descriptor */ - size_t apilength; /* length of the API name */ void *handle; /* context of dlopen */ struct afb_svc *service; /* handler for service started */ - struct afb_binding_interface interface; /* interface for the binding */ + struct afb_ditf ditf; /* daemon interface */ }; -static struct afb_event afb_api_so_event_make_cb(void *closure, const char *name); -static int afb_api_so_event_broadcast_cb(void *closure, const char *name, struct json_object *object); -static void afb_api_so_vverbose_cb(void *closure, int level, const char *file, int line, const char *fmt, va_list args); -static int afb_api_so_rootdir_get_fd(void *closure); -static int afb_api_so_rootdir_open_locale(void *closure, const char *filename, int flags, const char *locale); - -static const struct afb_daemon_itf daemon_itf = { - .event_broadcast = afb_api_so_event_broadcast_cb, - .get_event_loop = afb_common_get_event_loop, - .get_user_bus = afb_common_get_user_bus, - .get_system_bus = afb_common_get_system_bus, - .vverbose = afb_api_so_vverbose_cb, - .event_make = afb_api_so_event_make_cb, - .rootdir_get_fd = afb_api_so_rootdir_get_fd, - .rootdir_open_locale = afb_api_so_rootdir_open_locale -}; - -static struct afb_event afb_api_so_event_make_cb(void *closure, const char *name) -{ - size_t length; - char *event; - struct api_so_v2 *desc = closure; - - /* makes the event name */ - assert(desc->binding != NULL); - length = strlen(name); - event = alloca(length + 2 + desc->apilength); - memcpy(event, desc->binding->api, desc->apilength); - event[desc->apilength] = '/'; - memcpy(event + desc->apilength + 1, name, length + 1); - - /* crate the event */ - return afb_evt_create_event(event); -} - -static int afb_api_so_event_broadcast_cb(void *closure, const char *name, struct json_object *object) -{ - size_t length; - char *event; - struct api_so_v2 *desc = closure; - - /* makes the event name */ - assert(desc->binding != NULL); - length = strlen(name); - event = alloca(length + 2 + desc->apilength); - memcpy(event, desc->binding->api, 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_cb(void *closure, int level, const char *file, int line, const char *fmt, va_list args) -{ - char *p; - struct api_so_v2 *desc = closure; - - if (vasprintf(&p, fmt, args) < 0) - vverbose(level, file, line, fmt, args); - else { - verbose(level, file, line, "%s {binding %s}", p, desc->binding->api); - free(p); - } -} - -static int afb_api_so_rootdir_get_fd(void *closure) -{ - return afb_common_rootdir_get_fd(); -} - -static int afb_api_so_rootdir_open_locale(void *closure, const char *filename, int flags, const char *locale) -{ - return afb_common_rootdir_open_locale(filename, flags, locale); -} - static const struct afb_verb_v2 *search(struct api_so_v2 *desc, const char *verb) { const struct afb_verb_v2 *result; @@ -142,16 +68,11 @@ static void call_cb(void *closure, struct afb_xreq *xreq) verb = search(desc, xreq->verb); if (!verb) afb_xreq_fail_f(xreq, "unknown-verb", "verb %s unknown within api %s", xreq->verb, desc->binding->api); - else { - xreq->timeout = afb_api_so_timeout; - xreq->sessionflags = (int)verb->session; - xreq->group = desc; - xreq->callback = verb->callback; - afb_xreq_call(xreq); - } + else + afb_xreq_so_call(xreq, verb->session, verb->callback); } -static int service_start_cb(void *closure, int share_session, int onneed) +static int service_start_cb(void *closure, int share_session, int onneed, struct afb_apiset *apiset) { int (*start)(const struct afb_binding_interface *interface, struct afb_service service); void (*onevent)(const char *event, struct json_object *object); @@ -183,7 +104,7 @@ static int service_start_cb(void *closure, int share_session, int onneed) /* get the event handler if any */ onevent = desc->binding->onevent; - desc->service = afb_svc_create_v2(share_session, onevent, start, &desc->interface); + desc->service = afb_svc_create_v2(apiset, share_session, onevent, start, &desc->ditf.interface); if (desc->service == NULL) { /* starting error */ ERROR("Starting service %s failed", desc->binding->api); @@ -193,11 +114,38 @@ static int service_start_cb(void *closure, int share_session, int onneed) return 0; } -int afb_api_so_v2_add(const char *path, void *handle) +static void update_hooks_cb(void *closure) +{ + struct api_so_v2 *desc = closure; + afb_ditf_update_hook(&desc->ditf); +} + +static int get_verbosity_cb(void *closure) +{ + struct api_so_v2 *desc = closure; + return desc->ditf.interface.verbosity; +} + +static void set_verbosity_cb(void *closure, int level) +{ + struct api_so_v2 *desc = closure; + desc->ditf.interface.verbosity = level; +} + +static struct afb_api_itf so_v2_api_itf = { + .call = call_cb, + .service_start = service_start_cb, + .update_hooks = update_hooks_cb, + .get_verbosity = get_verbosity_cb, + .set_verbosity = set_verbosity_cb +}; + +int afb_api_so_v2_add(const char *path, void *handle, struct afb_apiset *apiset) { int rc; struct api_so_v2 *desc; struct afb_binding_v2 *binding; + struct afb_api afb_api; /* retrieves the register function */ binding = dlsym(handle, afb_api_so_v2_descriptor); @@ -211,7 +159,7 @@ int afb_api_so_v2_add(const char *path, void *handle) ERROR("binding [%s] bad api name...", path); goto error; } - if (!afb_apis_is_valid_api_name(binding->api)) { + if (!afb_api_is_valid_name(binding->api)) { ERROR("binding [%s] invalid api name...", path); goto error; } @@ -234,17 +182,14 @@ int afb_api_so_v2_add(const char *path, void *handle) desc->handle = handle; /* init the interface */ - desc->interface.verbosity = verbosity; - desc->interface.mode = AFB_MODE_LOCAL; - desc->interface.daemon.itf = &daemon_itf; - desc->interface.daemon.closure = desc; + afb_ditf_init(&desc->ditf, binding->api); /* for log purpose, a fake binding is needed here */ /* init the binding */ if (binding->init) { NOTICE("binding %s [%s] calling init function", binding->api, path); - rc = binding->init(&desc->interface); + rc = binding->init(&desc->ditf.interface); if (rc < 0) { ERROR("binding %s [%s] initialisation function failed...", binding->api, path); goto error2; @@ -252,11 +197,9 @@ int afb_api_so_v2_add(const char *path, void *handle) } /* records the binding */ - desc->apilength = strlen(binding->api); - if (afb_apis_add(binding->api, (struct afb_api){ - .closure = desc, - .call = call_cb, - .service_start = service_start_cb }) < 0) { + afb_api.closure = desc; + afb_api.itf = &so_v2_api_itf; + if (afb_apiset_add(apiset, binding->api, afb_api) < 0) { ERROR("binding [%s] can't be registered...", path); goto error2; }