X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so-v2.c;h=871be5249b50008b08ee7cc0d51046536a300ba6;hb=46ac3bf9554a75e137d5209d27160c1137d42302;hp=11fa334bd515d7119f1b7a0e2c3f85813dbc1223;hpb=4db507f7d53a09cf3f572dedcc304f334970ce06;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-api-so-v2.c b/src/afb-api-so-v2.c
index 11fa334b..871be524 100644
--- 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);
 
@@ -133,13 +109,24 @@ 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 */
+	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;
+	}
+
+
 	return 0;
 }
 
@@ -147,6 +134,8 @@ static void update_hooks_cb(void *closure)
 {
 	struct api_so_v2 *desc = closure;
 	afb_ditf_update_hook(&desc->ditf);
+	if (desc->service)
+		afb_svc_update_hook(desc->service);
 }
 
 static int get_verbosity_cb(void *closure)
@@ -195,7 +184,7 @@ static struct json_object *addperm_key_valint(struct json_object *o, const char
 	return addperm_key_val(o, key, json_object_new_int(val));
 }
 
-static struct json_object *make_description(struct api_so_v2 *desc)
+static struct json_object *make_description_openAPIv3(struct api_so_v2 *desc)
 {
 	char buffer[256];
 	const struct afb_verb_v2 *verb;
@@ -208,6 +197,7 @@ static struct json_object *make_description(struct api_so_v2 *desc)
 	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, "version", json_object_new_string("0.0.0"));
+	json_object_object_add(i, "description", json_object_new_string(desc->binding->info ?: desc->binding->api));
 
 	p = json_object_new_object();
 	json_object_object_add(r, "paths", p);
@@ -241,7 +231,7 @@ static struct json_object *make_description(struct api_so_v2 *desc)
 		json_object_object_add(g, "responses", a);
 		f = json_object_new_object();
 		json_object_object_add(a, "200", f);
-		json_object_object_add(f, "description", json_object_new_string(verb->verb));
+		json_object_object_add(f, "description", json_object_new_string(verb->info?:verb->verb));
 		verb++;
 	}
 	return r;
@@ -252,7 +242,7 @@ static struct json_object *describe_cb(void *closure)
 	struct api_so_v2 *desc = closure;
 	struct json_object *r = desc->binding->specification ? json_tokener_parse(desc->binding->specification) : NULL;
 	if (!r)
-		r = make_description(desc);
+		r = make_description_openAPIv3(desc);
 	return r;
 }
 
@@ -265,15 +255,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;
@@ -313,7 +294,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;