X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fafb-apis.c;h=0e257883503b5cb0d0ba3a329d16f7a975e12f42;hb=ede362db9ea82b85a531849c21582f1692bf0d4d;hp=a0af080031fb0cdd262f0af3369bc367baa59e95;hpb=6797f9722dd3e5463e0f7c118397955bb59a40c7;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-apis.c b/src/afb-apis.c
index a0af0800..0e257883 100644
--- a/src/afb-apis.c
+++ b/src/afb-apis.c
@@ -29,6 +29,7 @@
 #include "afb-context.h"
 #include "afb-hook.h"
 #include "afb-xreq.h"
+#include "jobs.h"
 
 #include <afb/afb-req-itf.h>
 
@@ -42,6 +43,16 @@ struct api_desc {
 
 static struct api_desc *apis_array = NULL;
 static int apis_count = 0;
+static int apis_timeout = 15;
+
+/**
+ * Set the API timeout
+ * @param to the timeout in seconds
+ */
+void afb_apis_set_timeout(int to)
+{
+	apis_timeout = to;
+}
 
 /**
  * Checks wether 'name' is a valid API name.
@@ -136,6 +147,8 @@ int afb_apis_add(const char *name, struct afb_api api)
 	apis->name = name;
 	apis_count++;
 
+	NOTICE("API %s added", name);
+
 	return 0;
 
 error:
@@ -178,31 +191,6 @@ static const struct api_desc *search(const char *api)
 	}
 }
 
-/**
- * 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
- */
-void afb_apis_call(struct afb_req req, struct afb_context *context, const char *api, const char *verb)
-{
-	const struct api_desc *a;
-
-	/* init hooking the request */
-	req = afb_hook_req_call(req, context, api, verb);
-
-	/* search the api */
-	a = search(api);
-	if (!a)
-		afb_req_fail(req, "fail", "api not found");
-	else {
-		context->api_key = a->api.closure;
-		a->api.call(a->api.closure, req, context, verb);
-	}
-}
-
 /**
  * Starts a service by its 'api' name.
  * @param api name of the service to start
@@ -244,27 +232,69 @@ int afb_apis_start_all_services(int share_session)
 }
 
 /**
- * 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
+ * Internal direct dispatch of the request 'xreq'
+ * @param xreq the request to dispatch
  */
-void afb_apis_xcall(struct afb_xreq *xreq)
+static void do_call_direct(struct afb_xreq *xreq)
 {
 	const struct api_desc *a;
 
-	/* init hooking the request */
-	// TODO req = afb_hook_req_call(req, context, api, verb);
-
 	/* 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.xcall(a->api.closure, xreq);
+		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;
+
+	if (signum != 0)
+		afb_xreq_fail_f(xreq, "aborted", "signal %s(%d) caught", strsignal(signum), signum);
+	else {
+		do_call_direct(xreq);
+	}
+	afb_xreq_unref(xreq);
+}
+
+/**
+ * Dispatch the request 'xreq' synchronously and directly.
+ * @param xreq the request to dispatch
+ */
+void afb_apis_call_direct(struct afb_xreq *xreq)
+{
+	/* init hooking the request */
+	// TODO req = afb_hook_req_call(req, context, api, verb);
+
+	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_addref(xreq);
+	rc = jobs_queue(NULL, apis_timeout, do_call_async, xreq);
+	if (rc < 0) {
+		/* TODO: allows or not to proccess it directly as when no threading? (see above) */
+		ERROR("can't process job with threads: %m");
+		afb_xreq_fail_f(xreq, "cancelled", "not able to create a job for the task");
+		afb_xreq_unref(xreq);
 	}
 }