afb-ditf: track daemon state

[src/app-framework-binder.git] / src / afb-api-so-v2.c

diff --git a/src/afb-api-so-v2.c b/src/afb-api-so-v2.c
index bc5ecdf..49fac6b 100644 (file)
--- a/src/afb-api-so-v2.c
+++ b/src/afb-api-so-v2.c
@@ -76,33 +76,9 @@ static void call_cb(void *closure, struct afb_xreq *xreq)
        afb_xreq_call_verb_v2(xreq, verb);
 }
 
-struct call_sync
-{
-       struct api_so_v2 *desc;
-       struct afb_xreq *xreq;
-};
-
-static void call_sync_cb_cb(int signum, void *closure)
-{
-       struct call_sync *cs = closure;
-       if (!signum)
-               call_cb(cs->desc, cs->xreq);
-       else  {
-               if (!cs->xreq->replied)
-                       afb_xreq_fail(cs->xreq, "aborted", "internal error");
-       }
-}
-
-static void call_sync_cb(void *closure, struct afb_xreq *xreq)
-{
-       struct call_sync cs = { .desc = closure, .xreq = xreq };
-
-       if (jobs_call(closure, 0, call_sync_cb_cb, &cs))
-               call_cb(closure, xreq);
-}
-
 static int service_start_cb(void *closure, int share_session, int onneed, struct afb_apiset *apiset)
 {
+       int rc;
        int (*start)();
        void (*onevent)(const char *event, struct json_object *object);
 
@@ -112,7 +88,7 @@ static int service_start_cb(void *closure, int share_session, int onneed, struct
        if (desc->service != NULL) {
                /* not an error when onneed */
                if (onneed != 0)
-                       return 0;
+                       goto done;
 
                /* already started: it is an error */
                ERROR("Service %s already started", desc->binding->api);
@@ -125,7 +101,7 @@ static int service_start_cb(void *closure, int share_session, int onneed, struct
        if (start == NULL && onevent == NULL) {
                /* not an error when onneed */
                if (onneed != 0)
-                       return 0;
+                       goto done;
 
                /* no initialisation method */
                ERROR("Binding %s is not a service", desc->binding->api);
@@ -133,13 +109,26 @@ static int service_start_cb(void *closure, int share_session, int onneed, struct
        }
 
        /* get the event handler if any */
-       desc->service = afb_svc_create_v2(desc->binding->api, apiset, share_session, start, onevent, desc->data);
+       desc->service = afb_svc_create(desc->binding->api, apiset, share_session, onevent, &desc->data->service);
        if (desc->service == NULL) {
                /* starting error */
                ERROR("Starting service %s failed", desc->binding->api);
                return -1;
        }
 
+       /* Starts the service */
+       desc->ditf.state = Daemon_Init;
+       rc = afb_svc_start_v2(desc->service, start);
+       if (rc < 0) {
+               /* initialisation error */
+               ERROR("Initialisation of service %s failed (%d): %m", desc->binding->api, rc);
+               afb_svc_destroy(desc->service, &desc->data->service);
+               desc->service = NULL;
+               return rc;
+       }
+
+done:
+       desc->ditf.state = Daemon_Run;
        return 0;
 }
 
@@ -268,15 +257,6 @@ static struct afb_api_itf so_v2_api_itf = {
        .describe = describe_cb
 };
 
-static struct afb_api_itf so_v2_sync_api_itf = {
-       .call = call_sync_cb,
-       .service_start = service_start_cb,
-       .update_hooks = update_hooks_cb,
-       .get_verbosity = get_verbosity_cb,
-       .set_verbosity = set_verbosity_cb,
-       .describe = describe_cb
-};
-
 int afb_api_so_v2_add_binding(const struct afb_binding_v2 *binding, void *handle, struct afb_apiset *apiset, struct afb_binding_data_v2 *data)
 {
        int rc;
@@ -316,7 +296,8 @@ int afb_api_so_v2_add_binding(const struct afb_binding_v2 *binding, void *handle
 
        /* records the binding */
        afb_api.closure = desc;
-       afb_api.itf = binding->noconcurrency ? &so_v2_sync_api_itf : &so_v2_api_itf;
+       afb_api.itf = &so_v2_api_itf;
+       afb_api.noconcurrency = binding->noconcurrency;
        if (afb_apiset_add(apiset, binding->api, afb_api) < 0) {
                ERROR("binding %s can't be registered to set %s...", binding->api, afb_apiset_name(apiset));
                goto error2;