X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-apis.c;h=2f61fe9547bb945ad2eca933228cb78561fa0900;hb=66c2dc7476c4a5105bcf233dd4e08f0466e7f3dc;hp=5a53d3752a35e31c0991b2692e0051aef6f2a82e;hpb=8ab18c9dd70205755b67001ce27a499c0196ad63;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-apis.c b/src/afb-apis.c
index 5a53d375..2f61fe95 100644
--- a/src/afb-apis.c
+++ b/src/afb-apis.c
@@ -28,22 +28,30 @@
 #include "afb-apis.h"
 #include "afb-context.h"
 #include "afb-hook.h"
+#include "afb-xreq.h"
+#include "jobs.h"
+
 #include <afb/afb-req-itf.h>
 
+/**
+ * Internal description of an api
+ */
 struct api_desc {
-	const char *name;
-	struct afb_api api;
+	const char *name;	/**< name of the api */
+	struct afb_api api;	/**< handler of the api */
 };
 
 static struct api_desc *apis_array = NULL;
 static int apis_count = 0;
+static int apis_timeout = 15;
 
 /**
- * Returns the current count of APIs
+ * Set the API timeout
+ * @param to the timeout in seconds
  */
-int afb_apis_count()
+void afb_apis_set_timeout(int to)
 {
-	return apis_count;
+	apis_timeout = to;
 }
 
 /**
@@ -139,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:
@@ -146,21 +156,15 @@ error:
 }
 
 /**
- * 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
+ * Search the 'api'.
  * @param api the api of the verb
- * @param verb the verb within the api
+ * @return the descriptor if found or NULL otherwise
  */
-void afb_apis_call(struct afb_req req, struct afb_context *context, const char *api, const char *verb)
+static const struct api_desc *search(const char *api)
 {
 	int i, c, up, lo;
 	const struct api_desc *a;
 
-	/* init hooking the request */
-	req = afb_hook_req_call(req, context, api, verb);
-
 	/* dichotomic search of the api */
 	/* initial slice */
 	lo = 0;
@@ -168,19 +172,16 @@ void afb_apis_call(struct afb_req req, struct afb_context *context, const char *
 	for (;;) {
 		/* check remaining slice */
 		if (lo >= up) {
-			/* empty ?! */
-			afb_req_fail(req, "fail", "api not found");
-			break;
+			/* not found */
+			return NULL;
 		}
 		/* check the mid of the slice */
 		i = (lo + up) >> 1;
 		a = &apis_array[i];
 		c = strcasecmp(a->name, api);
 		if (c == 0) {
-			/* api found */
-			context->api_index = i;
-			a->api.call(a->api.closure, req, context, verb);
-			break;
+			/* found */
+			return a;
 		}
 		/* update the slice */
 		if (c < 0)
@@ -190,6 +191,15 @@ void afb_apis_call(struct afb_req req, struct afb_context *context, const char *
 	}
 }
 
+/**
+ * Starts a service by its 'api' name.
+ * @param api name of the service to start
+ * @param share_session if true start the servic"e in a shared session
+ *                      if false start it in its own session
+ * @param onneed if true start the service if possible, if false the api
+ *               must be a service
+ * @return a positive number on success
+ */
 int afb_apis_start_service(const char *api, int share_session, int onneed)
 {
 	int i;
@@ -199,9 +209,16 @@ int afb_apis_start_service(const char *api, int share_session, int onneed)
 			return apis_array[i].api.service_start(apis_array[i].api.closure, share_session, onneed);
 	}
 	ERROR("can't find service %s", api);
+	errno = ENOENT;
 	return -1;
 }
 
+/**
+ * Starts all possible services but stops at first error.
+ * @param share_session if true start the servic"e in a shared session
+ *                      if false start it in its own session
+ * @return 0 on success or a negative number when an error is found
+ */
 int afb_apis_start_all_services(int share_session)
 {
 	int i, rc;
@@ -214,3 +231,53 @@ int afb_apis_start_all_services(int share_session)
 	return 0;
 }
 
+
+
+
+
+
+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);
+		}
+	}
+	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
+ */
+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);
+	}
+}
+