- return;
- }
-
- afb_xreq_process(&subcall->xreq, caller->apiset);
-}
-
-struct subcall_sync
-{
- struct afb_xreq *caller;
- const char *api;
- const char *verb;
- struct json_object *args;
- struct jobloop *jobloop;
- struct json_object *result;
- int iserror;
-};
-
-static void subcall_sync_leave(struct subcall_sync *sync)
-{
- struct jobloop *jobloop = sync->jobloop;
- sync->jobloop = NULL;
- if (jobloop)
- jobs_leave(jobloop);
-}
-
-static void subcall_sync_reply(void *closure, int iserror, struct json_object *obj)
-{
- struct subcall_sync *sync = closure;
-
- sync->iserror = iserror;
- sync->result = obj;
- json_object_get(obj);
- subcall_sync_leave(sync);
-}
-
-static void subcall_sync_enter(int signum, void *closure, struct jobloop *jobloop)
-{
- struct subcall_sync *sync = closure;
-
- if (!signum) {
- sync->jobloop = jobloop;
- afb_xreq_unhooked_subcall(sync->caller, sync->api, sync->verb, sync->args, subcall_sync_reply, sync);
- } else {
- sync->result = json_object_get(afb_msg_json_internal_error());
- sync->iserror = 1;
- subcall_sync_leave(sync);
- }
-}
-
-int afb_subcall_sync(
- struct afb_xreq *caller,
- const char *api,
- const char *verb,
- struct json_object *args,
- struct json_object **result
-)
-{
- int rc;
- struct subcall_sync sync;
-
- sync.caller = caller;
- sync.api = api;
- sync.verb = verb;
- sync.args = args;
- sync.jobloop = NULL;
- sync.result = NULL;
- sync.iserror = 1;
-
- rc = jobs_enter(NULL, 0, subcall_sync_enter, &sync);
- if (rc < 0) {
- sync.result = json_object_get(afb_msg_json_internal_error());
- sync.iserror = 1;
+ else {
+ afb_xreq_init(&subcall->xreq, &afb_subcall_xreq_itf);
+ afb_context_subinit(&subcall->xreq.context, &caller->context);
+ subcall->xreq.cred = afb_cred_addref(caller->cred);
+ subcall->xreq.json = args;
+ copy = (char*)&subcall[1];
+ memcpy(copy, api, lenapi);
+ subcall->xreq.api = copy;
+ copy = ©[lenapi];
+ memcpy(copy, verb, lenverb);
+ subcall->xreq.verb = copy;
+ subcall->caller = caller;
+ subcall->callback = callback;
+ subcall->closure = closure;
+ afb_xreq_addref(caller);
+ json_object_get(args); /* keep args existing */
+ afb_xreq_process(&subcall->xreq, caller->apiset);