afb-api: Define the notion of group for concurrency

Change-Id: Iafbbff8387bb1f8577cb7aeb6e8ed4b14ab1f4a4
Signed-off-by: José Bollo <jose.bollo@iot.bzh>

6 files changed, 8 insertions, 10 deletions

diff --git a/src/afb-api-dbus.c b/src/afb-api-dbus.c
index 2d03269f..d31eda00 100644
--- a/src/afb-api-dbus.c
+++ b/src/afb-api-dbus.c
@@ -610,7 +610,7 @@ int afb_api_dbus_add_client(const char *path, struct afb_apiset *apiset)
 	/* record it as an API */
 	afb_api.closure = api;
 	afb_api.itf = &dbus_api_itf;
-	afb_api.noconcurrency = 0;
+	afb_api.group = NULL;
 	if (afb_apiset_add(apiset, api->api, afb_api) < 0)
 		goto error2;
 
diff --git a/src/afb-api-so-v1.c b/src/afb-api-so-v1.c
index b885cf72..c69f2945 100644
--- a/src/afb-api-so-v1.c
+++ b/src/afb-api-so-v1.c
@@ -256,7 +256,7 @@ int afb_api_so_v1_add(const char *path, void *handle, struct afb_apiset *apiset)
 		afb_export_rename(desc->export, desc->binding->v1.prefix);
 	afb_api.closure = desc;
 	afb_api.itf = &so_v1_api_itf;
-	afb_api.noconcurrency = 0;
+	afb_api.group = NULL;
 	if (afb_apiset_add(apiset, afb_export_apiname(desc->export), afb_api) < 0) {
 		ERROR("binding [%s] can't be registered...", path);
 		goto error;
diff --git a/src/afb-api-so-v2.c b/src/afb-api-so-v2.c
index 14a92a9f..9d4caeeb 100644
--- a/src/afb-api-so-v2.c
+++ b/src/afb-api-so-v2.c
@@ -264,7 +264,7 @@ 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 = &so_v2_api_itf;
-	afb_api.noconcurrency = binding->noconcurrency;
+	afb_api.group = binding->noconcurrency ? export : NULL;
 	if (afb_apiset_add(apiset, afb_export_apiname(desc->export), afb_api) < 0) {
 		ERROR("binding %s can't be registered to set %s...", afb_export_apiname(desc->export), afb_apiset_name(apiset));
 		goto error;
diff --git a/src/afb-api.h b/src/afb-api.h
index 1a149886..dd5d4e0c 100644
--- a/src/afb-api.h
+++ b/src/afb-api.h
@@ -35,7 +35,7 @@ struct afb_api
 {
 	void *closure;
 	struct afb_api_itf *itf;
-	unsigned noconcurrency: 1;
+	const void *group;
 };
 
 extern int afb_api_is_valid_name(const char *name);
diff --git a/src/afb-stub-ws.c b/src/afb-stub-ws.c
index 83f07cac..bdc2c144 100644
--- a/src/afb-stub-ws.c
+++ b/src/afb-stub-ws.c
@@ -680,7 +680,7 @@ struct afb_api afb_stub_ws_client_api(struct afb_stub_ws *stubws)
 	assert(!stubws->listener); /* check client */
 	api.closure = stubws;
 	api.itf = &ws_api_itf;
-	api.noconcurrency = 0;
+	api.group = NULL;
 	return api;
 }
 
diff --git a/src/afb-xreq.c b/src/afb-xreq.c
index 696bf9d4..9c0ba16e 100644
--- a/src/afb-xreq.c
+++ b/src/afb-xreq.c
@@ -1030,12 +1030,10 @@ void afb_xreq_process(struct afb_xreq *xreq, struct afb_apiset *apiset)
 	xreq->context.api_key = api;
 
 	/* check self locking */
-	if (!api->noconcurrency)
-		api = NULL;
-	else {
+	if (api->group) {
 		caller = xreq->caller;
 		while (caller) {
-			if (caller->context.api_key == api) {
+			if (((const struct afb_api *)caller->context.api_key)->group == api->group) {
 				/* noconcurrency lock detected */
 				ERROR("self-lock detected in call stack for API %s", xreq->api);
 				early_failure(xreq, "self-locked", "recursive self lock, API %s", xreq->api);
@@ -1047,7 +1045,7 @@ void afb_xreq_process(struct afb_xreq *xreq, struct afb_apiset *apiset)
 
 	/* queue the request job */
 	afb_xreq_unhooked_addref(xreq);
-	if (jobs_queue(api, afb_apiset_timeout_get(apiset), process_async, xreq) < 0) {
+	if (jobs_queue(api->group, afb_apiset_timeout_get(apiset), process_async, xreq) < 0) {
 		/* TODO: allows or not to proccess it directly as when no threading? (see above) */
 		ERROR("can't process job with threads: %m");
 		early_failure(xreq, "cancelled", "not able to create a job for the task");