diff options
| author |   José Bollo <jose.bollo@iot.bzh> | 2017-09-21 07:57:24 +0200 |
|---|---|---|
| committer | José Bollo <jose.bollo@iot.bzh> | 2017-10-09 14:08:32 +0200 |
| commit | f2e72e1858d0be1a9cf3c0c4263f0bd81570d0e8 (patch) | |
| tree | 392c0dbdc797d7400e2801124b4629b9906beb65 /src/afb-xreq.c | |
| parent | 91b744a510bbf41526f0931df2320379bec87c38 (diff) | |
afb-api: Define the notion of group for concurrency
Change-Id: Iafbbff8387bb1f8577cb7aeb6e8ed4b14ab1f4a4
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'src/afb-xreq.c')
| -rw-r--r-- | src/afb-xreq.c | 8 |
1 files changed, 3 insertions, 5 deletions
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"); |