X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-apis.c;h=9ffffdb3b5d22ed632f419c7e7df20bef83e09b4;hb=3bf52bb36ed428d0a7b947519fbccc7c376fd4a9;hp=c251aa7a07ae69516a00ab41e2802e0a80de7537;hpb=5b5a2e4412eea806451c016da9fb285bc09c17ab;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-apis.c b/src/afb-apis.c
index c251aa7a..9ffffdb3 100644
--- a/src/afb-apis.c
+++ b/src/afb-apis.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 "IoT.bzh"
+ * Copyright (C) 2016, 2017 "IoT.bzh"
  * Author "Fulup Ar Foll"
  * Author José Bollo <jose.bollo@iot.bzh>
  *
@@ -21,34 +21,36 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <errno.h>
 
-#include "session.h"
+#include "afb-session.h"
 #include "verbose.h"
 #include "afb-apis.h"
 #include "afb-context.h"
+#include "afb-hook.h"
 #include <afb/afb-req-itf.h>
 
 struct api_desc {
-	struct afb_api api;
 	const char *name;
-	size_t namelen;
+	struct afb_api api;
 };
 
 static struct api_desc *apis_array = NULL;
 static int apis_count = 0;
 
-int afb_apis_count()
-{
-	return apis_count;
-}
-
+/**
+ * Checks wether 'name' is a valid API name.
+ * @return 1 if valid, 0 otherwise
+ */
 int afb_apis_is_valid_api_name(const char *name)
 {
 	unsigned char c;
 
 	c = (unsigned char)*name;
 	if (c == 0)
+		/* empty names aren't valid */
 		return 0;
+
 	do {
 		if (c < (unsigned char)'\x80') {
 			switch(c) {
@@ -73,37 +75,59 @@ int afb_apis_is_valid_api_name(const char *name)
 	return 1;
 }
 
+/**
+ * Adds the api of 'name' described by 'api'.
+ * @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:
+ *   - EINVAL if name isn't valid
+ *   - EEXIST if name already registered
+ *   - ENOMEM when out of memory
+ */
 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)) {
 		ERROR("invalid api name forbidden (name is '%s')", name);
+		errno = EINVAL;
 		goto error;
 	}
 
 	/* 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 */
 	apis = realloc(apis_array, ((unsigned)apis_count + 1) * sizeof * apis);
 	if (apis == NULL) {
 		ERROR("out of memory");
+		errno = ENOMEM;
 		goto error;
 	}
 	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->namelen = strlen(name);
 	apis->name = name;
 	apis_count++;
 
@@ -113,25 +137,49 @@ error:
 	return -1;
 }
 
-void afb_apis_call_(struct afb_req req, struct afb_context *context, const char *api, const char *verb)
-{
-	afb_apis_call(req, context, api, strlen(api), verb, strlen(verb));
-}
-
-void afb_apis_call(struct afb_req req, struct afb_context *context, const char *api, size_t lenapi, const char *verb, size_t lenverb)
+/**
+ * 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)
 {
-	int i;
+	int i, c, up, lo;
 	const struct api_desc *a;
 
-	a = apis_array;
-	for (i = 0 ; i < apis_count ; i++, a++) {
-		if (a->namelen == lenapi && !strncasecmp(a->name, api, lenapi)) {
-			context->api_index = i;
-			a->api.call(a->api.closure, req, context, verb, lenverb);
-			return;
+	/* init hooking the request */
+	req = afb_hook_req_call(req, context, api, verb);
+
+	/* dichotomic search of the api */
+	/* initial slice */
+	lo = 0;
+	up = apis_count;
+	for (;;) {
+		/* check remaining slice */
+		if (lo >= up) {
+			/* empty ?! */
+			afb_req_fail(req, "fail", "api not found");
+			break;
+		}
+		/* 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_key = a->api.closure;
+			a->api.call(a->api.closure, req, context, verb);
+			break;
 		}
+		/* update the slice */
+		if (c < 0)
+			lo = i + 1;
+		else
+			up = i;
 	}
-	afb_req_fail(req, "fail", "api not found");
 }
 
 int afb_apis_start_service(const char *api, int share_session, int onneed)