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

diff --git a/src/afb-apis.c b/src/afb-apis.c
index 3463f535..0e257883 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 {
-	struct afb_api api;
-	const char *name;
+	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;
 }
 
 /**
@@ -85,7 +93,7 @@ int afb_apis_is_valid_api_name(const char *name)
 
 /**
  * Adds the api of 'name' described by 'api'.
- * @param name the name of the api to add
+ * @param name the name of the api to add (have to survive, not copied!)
  * @param api the api
  * @returns 0 in case of success or -1 in case
  * of error with errno set:
@@ -96,7 +104,7 @@ int afb_apis_is_valid_api_name(const char *name)
 int afb_apis_add(const char *name, struct afb_api api)
 {
 	struct api_desc *apis;
-	int i;
+	int i, c;
 
 	/* Checks the api name */
 	if (!afb_apis_is_valid_api_name(name)) {
@@ -107,11 +115,14 @@ int afb_apis_add(const char *name, struct afb_api api)
 
 	/* check previously existing plugin */
 	for (i = 0 ; i < apis_count ; i++) {
-		if (!strcasecmp(apis_array[i].name, name)) {
+		c = strcasecmp(apis_array[i].name, name);
+		if (c == 0) {
 			ERROR("api of name %s already exists", name);
 			errno = EEXIST;
 			goto error;
 		}
+		if (c > 0)
+			break;
 	}
 
 	/* allocates enough memory */
@@ -123,35 +134,72 @@ int afb_apis_add(const char *name, struct afb_api api)
 	}
 	apis_array = apis;
 
+	/* copy higher part of the array */
+	c = apis_count;
+	while (c > i) {
+		apis_array[c] = apis_array[c - 1];
+		c--;
+	}
+
 	/* record the plugin */
-	apis = &apis_array[apis_count];
+	apis = &apis_array[i];
 	apis->api = api;
 	apis->name = name;
 	apis_count++;
 
+	NOTICE("API %s added", name);
+
 	return 0;
 
 error:
 	return -1;
 }
 
-void afb_apis_call(struct afb_req req, struct afb_context *context, const char *api, const char *verb)
+/**
+ * Search the 'api'.
+ * @param api the api of the verb
+ * @return the descriptor if found or NULL otherwise
+ */
+static const struct api_desc *search(const char *api)
 {
-	int i;
+	int i, c, up, lo;
 	const struct api_desc *a;
 
-	req = afb_hook_req_call(req, context, api, verb);
-	a = apis_array;
-	for (i = 0 ; i < apis_count ; i++, a++) {
-		if (!strcasecmp(a->name, api)) {
-			context->api_index = i;
-			a->api.call(a->api.closure, req, context, verb);
-			return;
+	/* dichotomic search of the api */
+	/* initial slice */
+	lo = 0;
+	up = apis_count;
+	for (;;) {
+		/* check remaining slice */
+		if (lo >= up) {
+			/* 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) {
+			/* found */
+			return a;
 		}
+		/* update the slice */
+		if (c < 0)
+			lo = i + 1;
+		else
+			up = i;
 	}
-	afb_req_fail(req, "fail", "api not found");
 }
 
+/**
+ * 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;
@@ -161,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;
@@ -176,3 +231,70 @@ 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;
+
+	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);
+	}
+}
+