X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so-v2.c;h=8403366b364f80cb41da0eca41c1217cdbfe458c;hb=550b36945f2e9eae1fc4b822ea9a00a2a866eb83;hp=038f1ce20f134c99e7a4cfedb56adab6347e2827;hpb=11e2d4395056c7bd2a618b4fa7ffdd70af05d14e;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-api-so-v2.c b/src/afb-api-so-v2.c
index 038f1ce2..8403366b 100644
--- a/src/afb-api-so-v2.c
+++ b/src/afb-api-so-v2.c
@@ -16,7 +16,6 @@
  */
 
 #define _GNU_SOURCE
-#define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO
 
 #include <stdlib.h>
 #include <string.h>
@@ -76,31 +75,6 @@ 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;
@@ -113,10 +87,10 @@ 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);
+		ERROR("Service %s already started", desc->ditf.api);
 		return -1;
 	}
 
@@ -126,32 +100,34 @@ 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);
+		ERROR("Binding %s is not a service", desc->ditf.api);
 		return -1;
 	}
 
 	/* get the event handler if any */
-	desc->service = afb_svc_create(desc->binding->api, apiset, share_session, onevent, &desc->data->service);
+	desc->service = afb_svc_create(desc->ditf.api, apiset, share_session, onevent, &desc->data->service);
 	if (desc->service == NULL) {
 		/* starting error */
-		ERROR("Starting service %s failed", desc->binding->api);
+		ERROR("Starting service %s failed", desc->ditf.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);
+		ERROR("Initialisation of service %s failed (%d): %m", desc->ditf.api, rc);
 		afb_svc_destroy(desc->service, &desc->data->service);
 		desc->service = NULL;
 		return rc;
 	}
 
-
+done:
+	desc->ditf.state = Daemon_Run;
 	return 0;
 }
 
@@ -220,9 +196,9 @@ static struct json_object *make_description_openAPIv3(struct api_so_v2 *desc)
 
 	i = json_object_new_object();
 	json_object_object_add(r, "info", i);
-	json_object_object_add(i, "title", json_object_new_string(desc->binding->api));
+	json_object_object_add(i, "title", json_object_new_string(desc->ditf.api));
 	json_object_object_add(i, "version", json_object_new_string("0.0.0"));
-	json_object_object_add(i, "description", json_object_new_string(desc->binding->info ?: desc->binding->api));
+	json_object_object_add(i, "description", json_object_new_string(desc->binding->info ?: desc->ditf.api));
 
 	p = json_object_new_object();
 	json_object_object_add(r, "paths", p);
@@ -280,15 +256,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;
@@ -321,19 +288,20 @@ int afb_api_so_v2_add_binding(const struct afb_binding_v2 *binding, void *handle
 		INFO("binding %s calling preinit function", binding->api);
 		rc = binding->preinit();
 		if (rc < 0) {
-			ERROR("binding %s preinit function failed...", binding->api);
+			ERROR("binding %s preinit function failed...", desc->ditf.api);
 			goto error2;
 		}
 	}
 
 	/* records the binding */
 	afb_api.closure = desc;
-	afb_api.itf = binding->noconcurrency ? &so_v2_sync_api_itf : &so_v2_api_itf;
-	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));
+	afb_api.itf = &so_v2_api_itf;
+	afb_api.noconcurrency = binding->noconcurrency;
+	if (afb_apiset_add(apiset, desc->ditf.api, afb_api) < 0) {
+		ERROR("binding %s can't be registered to set %s...", desc->ditf.api, afb_apiset_name(apiset));
 		goto error2;
 	}
-	INFO("binding %s added to set %s", binding->api, afb_apiset_name(apiset));
+	INFO("binding %s added to set %s", desc->ditf.api, afb_apiset_name(apiset));
 	return 1;
 
 error2: