X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fafb-subcall.c;h=498f73b585aed9b05221dd1fe93c3fdd15aa5bf0;hb=03f863dd080d32f71c4a0755c02e23c72e4cb342;hp=82128d8a4fee60a35a39163c9f687bf8f6822fad;hpb=5e7d680c173ddbb26db4e49f7738f82e89299362;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-subcall.c b/src/afb-subcall.c
index 82128d8a..498f73b5 100644
--- a/src/afb-subcall.c
+++ b/src/afb-subcall.c
@@ -29,13 +29,14 @@
 #include "afb-context.h"
 #include "afb-xreq.h"
 #include "verbose.h"
+#include "jobs.h"
 
 struct subcall;
 
-static void subcall_destroy(void *closure);
-static void subcall_reply(void *closure, int iserror, struct json_object *obj);
-static int subcall_subscribe(void *closure, struct afb_event event);
-static int subcall_unsubscribe(void *closure, struct afb_event event);
+static void subcall_destroy(struct afb_xreq *xreq);
+static void subcall_reply(struct afb_xreq *xreq, int iserror, struct json_object *obj);
+static int subcall_subscribe(struct afb_xreq *xreq, struct afb_event event);
+static int subcall_unsubscribe(struct afb_xreq *xreq, struct afb_event event);
 
 const struct afb_xreq_query_itf afb_subcall_xreq_itf = {
 	.reply = subcall_reply,
@@ -52,47 +53,37 @@ struct subcall
 	void *closure;
 };
 
-static void subcall_destroy(void *closure)
+static void subcall_destroy(struct afb_xreq *xreq)
 {
-	struct subcall *subcall = closure;
+	struct subcall *subcall = CONTAINER_OF_XREQ(struct subcall, xreq);
 
 	json_object_put(subcall->xreq.json);
 	afb_xreq_unref(subcall->caller);
 	free(subcall);
 }
 
-static void subcall_reply(void *closure, int iserror, struct json_object *obj)
+static void subcall_reply(struct afb_xreq *xreq, int iserror, struct json_object *obj)
 {
-	struct subcall *subcall = closure;
+	struct subcall *subcall = CONTAINER_OF_XREQ(struct subcall, xreq);
 
 	subcall->callback(subcall->closure, iserror, obj);
 	json_object_put(obj);
 }
 
-static int subcall_subscribe(void *closure, struct afb_event event)
+static int subcall_subscribe(struct afb_xreq *xreq, struct afb_event event)
 {
-	struct subcall *subcall = closure;
+	struct subcall *subcall = CONTAINER_OF_XREQ(struct subcall, xreq);
 
 	return afb_xreq_subscribe(subcall->caller, event);
 }
 
-static int subcall_unsubscribe(void *closure, struct afb_event event)
+static int subcall_unsubscribe(struct afb_xreq *xreq, struct afb_event event)
 {
-	struct subcall *subcall = closure;
+	struct subcall *subcall = CONTAINER_OF_XREQ(struct subcall, xreq);
 
 	return afb_xreq_unsubscribe(subcall->caller, event);
 }
 
-void afb_subcall_internal_error(void (*callback)(void*, int, struct json_object*), void *closure)
-{
-	static struct json_object *obj;
-
-	if (obj == NULL)
-		obj = afb_msg_json_reply_error("failed", "internal error", NULL, NULL);
-
-	callback(closure, 1, obj);
-}
-
 static struct subcall *create_subcall(struct afb_xreq *caller, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *closure)
 {
 	struct subcall *subcall;
@@ -102,17 +93,16 @@ static struct subcall *create_subcall(struct afb_xreq *caller, const char *api,
 		return NULL;
 	}
 
-
+	afb_xreq_init(&subcall->xreq, &afb_subcall_xreq_itf);
 	afb_context_subinit(&subcall->xreq.context, &caller->context);
-	subcall->xreq.refcount = 1;
 	subcall->xreq.json = args;
 	subcall->xreq.api = api; /* TODO: alloc ? */
 	subcall->xreq.verb = verb; /* TODO: alloc ? */
-	subcall->xreq.query = subcall;
-	subcall->xreq.queryitf = &afb_subcall_xreq_itf;
 	subcall->caller = caller;
 	subcall->callback = callback;
 	subcall->closure = closure;
+	afb_xreq_addref(caller);
+	json_object_get(args);
 	return subcall;
 }
 
@@ -129,13 +119,84 @@ void afb_subcall(
 
 	subcall = create_subcall(caller, api, verb, args, callback, closure);
 	if (subcall == NULL) {
-		afb_subcall_internal_error(callback, closure);
+		callback(closure, 1, afb_msg_json_internal_error());
 		return;
 	}
 
-	afb_xreq_addref(caller);
-	afb_apis_xcall(&subcall->xreq);
+	afb_apis_call(&subcall->xreq);
 	afb_xreq_unref(&subcall->xreq);
 }
 
+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;
+	}
+	rc = !sync.iserror;
+	*result = sync.result;
+	return rc;
+}
+