diff options
author | José Bollo <jose.bollo@iot.bzh> | 2017-09-20 17:24:14 +0200 |
---|---|---|
committer | José Bollo <jose.bollo@iot.bzh> | 2017-10-09 14:08:32 +0200 |
commit | 91b744a510bbf41526f0931df2320379bec87c38 (patch) | |
tree | 557a1b2ac827ccfa615026a875b81f213000ed05 /src/afb-api-so-v1.c | |
parent | 7b42076a77b81e205ecc704c3bb7538716567487 (diff) |
Refactor of starting apis
Change-Id: Ib2efcd8747c3537714dfa7058bb0623d6e283c3d
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'src/afb-api-so-v1.c')
-rw-r--r-- | src/afb-api-so-v1.c | 53 |
1 files changed, 6 insertions, 47 deletions
diff --git a/src/afb-api-so-v1.c b/src/afb-api-so-v1.c index ef73b343..b885cf72 100644 --- a/src/afb-api-so-v1.c +++ b/src/afb-api-so-v1.c @@ -73,53 +73,8 @@ static void call_cb(void *closure, struct afb_xreq *xreq) static int service_start_cb(void *closure, int share_session, int onneed, struct afb_apiset *apiset) { - int rc; - int (*init)(struct afb_service service); - void (*onevent)(const char *event, struct json_object *object); - struct api_so_v1 *desc = closure; - - /* check state */ - if (afb_export_is_started(desc->export)) { - /* not an error when onneed */ - if (onneed != 0) - goto done; - - /* already started: it is an error */ - ERROR("Service %s already started", afb_export_apiname(desc->export)); - return -1; - } - - /* get the initialisation */ - init = dlsym(desc->handle, afb_api_so_v1_service_init); - onevent = dlsym(desc->handle, afb_api_so_v1_service_event); - - /* unshare the session if asked */ - if (!share_session) { - rc = afb_export_unshare_session(desc->export); - if (rc < 0) { - ERROR("Can't unshare the session for %s", afb_export_apiname(desc->export)); - return -1; - } - } - - /* set event handling */ - rc = afb_export_handle_events(desc->export, onevent); - if (rc < 0) { - ERROR("Can't set event handler for %s", afb_export_apiname(desc->export)); - return -1; - } - - /* Starts the service */ - rc = afb_export_start_v1(desc->export, init); - if (rc < 0) { - /* initialisation error */ - ERROR("Initialisation of service %s failed (%d): %m", afb_export_apiname(desc->export), rc); - return rc; - } - -done: - return 0; + return afb_export_start(desc->export, share_session, onneed, apiset); } static void update_hooks_cb(void *closure) @@ -243,6 +198,8 @@ int afb_api_so_v1_add(const char *path, void *handle, struct afb_apiset *apiset) { struct api_so_v1 *desc; struct afb_binding_v1 *(*register_function) (const struct afb_binding_interface_v1 *interface); + int (*init)(struct afb_service service); + void (*onevent)(const char *event, struct json_object *object); struct afb_api afb_api; struct afb_export *export; @@ -253,7 +210,9 @@ int afb_api_so_v1_add(const char *path, void *handle, struct afb_apiset *apiset) INFO("binding [%s] is a valid AFB binding V1", path); /* allocates the description */ - export = afb_export_create_v1(path); + init = dlsym(handle, afb_api_so_v1_service_init); + onevent = dlsym(handle, afb_api_so_v1_service_event); + export = afb_export_create_v1(path, init, onevent); desc = calloc(1, sizeof *desc); if (desc == NULL || export == NULL) { ERROR("out of memory"); |