X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fafb-api-so-v1.c;h=84b870d7e3e68f75f344ef7aa220fc0d40a2f856;hb=6120bbbd2cbd1f06904f887957d92ac740631c55;hp=38f1b275debb5908dd12eb77a845a58f4b80ab86;hpb=78867fd5c3c67839116b89d636b2f191fc14f4e1;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-api-so-v1.c b/src/afb-api-so-v1.c
index 38f1b275..84b870d7 100644
--- a/src/afb-api-so-v1.c
+++ b/src/afb-api-so-v1.c
@@ -16,7 +16,6 @@
  */
 
 #define _GNU_SOURCE
-#define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO
 
 #include <stdio.h>
 #include <string.h>
@@ -78,6 +77,7 @@ 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);
 
@@ -87,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->v1.prefix);
+		ERROR("Service %s already started", desc->ditf.api);
 		return -1;
 	}
 
@@ -100,21 +100,33 @@ static int service_start_cb(void *closure, int share_session, int onneed, struct
 	if (init == 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->v1.prefix);
+		ERROR("Binding %s is not a service", desc->ditf.api);
 		return -1;
 	}
 
 	/* get the event handler if any */
-	desc->service = afb_svc_create_v1(desc->binding->v1.prefix, apiset, share_session, init, onevent);
+	desc->service = afb_svc_create(desc->ditf.api, apiset, share_session, onevent, NULL);
 	if (desc->service == NULL) {
-		/* starting error */
-		ERROR("Starting service %s failed", desc->binding->v1.prefix);
+		ERROR("Creation of service %s failed", desc->ditf.api);
 		return -1;
 	}
 
+	/* Starts the service */
+	desc->ditf.state = Daemon_Init;
+	rc = afb_svc_start_v1(desc->service, init);
+	if (rc < 0) {
+		/* initialisation error */
+		ERROR("Initialisation of service %s failed (%d): %m", desc->ditf.api, rc);
+		afb_svc_destroy(desc->service, NULL);
+		desc->service = NULL;
+		return rc;
+	}
+
+done:
+	desc->ditf.state = Daemon_Run;
 	return 0;
 }
 
@@ -183,8 +195,9 @@ static struct json_object *make_description_openAPIv3(struct api_so_v1 *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->v1.info));
+	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->v1.info ?: desc->ditf.api));
 
 	p = json_object_new_object();
 	json_object_object_add(r, "paths", p);
@@ -290,14 +303,16 @@ int afb_api_so_v1_add(const char *path, void *handle, struct afb_apiset *apiset)
 	}
 
 	/* records the binding */
-	afb_ditf_rename(&desc->ditf, desc->binding->v1.prefix);
+	if (desc->ditf.api == path)
+		afb_ditf_rename(&desc->ditf, desc->binding->v1.prefix);
 	afb_api.closure = desc;
 	afb_api.itf = &so_v1_api_itf;
-	if (afb_apiset_add(apiset, desc->binding->v1.prefix, afb_api) < 0) {
+	afb_api.noconcurrency = 0;
+	if (afb_apiset_add(apiset, desc->ditf.api, afb_api) < 0) {
 		ERROR("binding [%s] can't be registered...", path);
 		goto error2;
 	}
-	INFO("binding %s loaded with API prefix %s", path, desc->binding->v1.prefix);
+	INFO("binding %s loaded with API prefix %s", path, desc->ditf.api);
 	return 1;
 
 error2: