X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fafb-apis.c;h=1355894d74e9958c143a6cb94431db6801f3d253;hb=522569c5a9da8566f5213fa5b9b3abadf746331d;hp=2f61fe9547bb945ad2eca933228cb78561fa0900;hpb=41618d081d650f9cc105034bfa37d3b861663db7;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-apis.c b/src/afb-apis.c
index 2f61fe95..1355894d 100644
--- a/src/afb-apis.c
+++ b/src/afb-apis.c
@@ -27,7 +27,6 @@
 #include "verbose.h"
 #include "afb-apis.h"
 #include "afb-context.h"
-#include "afb-hook.h"
 #include "afb-xreq.h"
 #include "jobs.h"
 
@@ -231,46 +230,59 @@ int afb_apis_start_all_services(int share_session)
 	return 0;
 }
 
+/**
+ * Internal direct dispatch of the request 'xreq'
+ * @param xreq the request to dispatch
+ */
+static void do_call_direct(struct afb_xreq *xreq)
+{
+	const struct api_desc *a;
 
+	/* search the api */
+	a = search(xreq->api);
+	if (!a)
+		afb_xreq_fail_f(xreq, "unknown-api", "api %s not found", xreq->api);
+	else {
+		xreq->context.api_key = a->api.closure;
+		a->api.call(a->api.closure, xreq);
+	}
+}
 
-
-
-
+/**
+ * Asynchronous dispatch callback for the request 'xreq'
+ * @param signum 0 on normal flow or the signal number that interupted the normal flow
+ */
 static void do_call_async(int signum, void *arg)
 {
 	struct afb_xreq *xreq = arg;
-	const struct api_desc *a;
 
 	if (signum != 0)
 		afb_xreq_fail_f(xreq, "aborted", "signal %s(%d) caught", strsignal(signum), signum);
 	else {
-		/* search the api */
-		a = search(xreq->api);
-		if (!a)
-			afb_xreq_fail_f(xreq, "unknown-api", "api %s not found", xreq->api);
-		else {
-			xreq->context.api_key = a->api.closure;
-			a->api.call(a->api.closure, xreq);
-		}
+		do_call_direct(xreq);
 	}
 	afb_xreq_unref(xreq);
 }
 
 /**
- * Dispatch the request 'req' with the 'context' to the
- * method of 'api' and 'verb'.
- * @param req the request to dispatch
- * @param context the context of the request
- * @param api the api of the verb
- * @param verb the verb within the api
+ * Dispatch the request 'xreq' synchronously and directly.
+ * @param xreq the request to dispatch
+ */
+void afb_apis_call_direct(struct afb_xreq *xreq)
+{
+	afb_xreq_begin(xreq);
+	do_call_direct(xreq);
+}
+
+/**
+ * Dispatch the request 'xreq' asynchronously.
+ * @param xreq the request to dispatch
  */
 void afb_apis_call(struct afb_xreq *xreq)
 {
 	int rc;
 
-	/* init hooking the request */
-	// TODO req = afb_hook_req_call(req, context, api, verb);
-
+	afb_xreq_begin(xreq);
 	afb_xreq_addref(xreq);
 	rc = jobs_queue(NULL, apis_timeout, do_call_async, xreq);
 	if (rc < 0) {