X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-apis.c;h=561b2752bf20cbeb5d1131c81f7569bb5552f5ed;hb=041ce4919b4513f7e019b018558e947164101b35;hp=3dcad65156fa668d46779299bd4909cefb51e983;hpb=ca208671cc79bbc05c574df788035878e5d39382;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-apis.c b/src/afb-apis.c
index 3dcad651..561b2752 100644
--- a/src/afb-apis.c
+++ b/src/afb-apis.c
@@ -32,23 +32,29 @@
 #include <limits.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <signal.h>
+#include <time.h>
+#include <sys/syscall.h>
+#include <setjmp.h>
 
-#include "../include/local-def.h"
+#include "afb-plugin.h"
+#include "afb-req-itf.h"
+#include "afb-poll-itf.h"
 
+#include "session.h"
 #include "afb-apis.h"
+#include "verbose.h"
+#include "utils-upoll.h"
 
 struct api_desc {
-	AFB_plugin *plugin;	/* descriptor */
-	size_t prefixlen;
-	const char *prefix;
-	void *handle;		/* context of dlopen */
+	struct afb_api api;
+	const char *name;
+	size_t namelen;
 };
 
 static struct api_desc *apis_array = NULL;
 static int apis_count = 0;
 
-static const char plugin_register_function[] = "pluginRegister";
-
 int afb_apis_count()
 {
 	return apis_count;
@@ -56,225 +62,66 @@ int afb_apis_count()
 
 void afb_apis_free_context(int apiidx, void *context)
 {
-	void (*cb)(void*);
-
-	assert(0 <= apiidx && apiidx < apis_count);
-	cb = apis_array[apiidx].plugin->freeCtxCB;
-	if (cb)
-		cb(context);
-	else
-		free(context);
-}
-
-const struct AFB_restapi *afb_apis_get(int apiidx, int verbidx)
-{
-	assert(0 <= apiidx && apiidx < apis_count);
-	return &apis_array[apiidx].plugin->apis[verbidx];
+	const struct afb_api *api;
+	api = &apis_array[apiidx].api;
+	api->free_context(api->closure, context);
 }
 
-int afb_apis_get_verbidx(int apiidx, const char *name)
-{
-	const struct AFB_restapi *apis;
-	int idx;
-
-	assert(0 <= apiidx && apiidx < apis_count);
-	apis = apis_array[apiidx].plugin->apis;
-	for (idx = 0 ; apis[idx].name ; idx++)
-		if (!strcasecmp(apis[idx].name, name))
-			return idx;
-	return -1;
-}
-
-int afb_apis_get_apiidx(const char *prefix, size_t length)
-{
-	int i;
-	const struct api_desc *a;
-
-	if (!length)
-		length = strlen(prefix);
-
-	for (i = 0 ; i < apis_count ; i++) {
-		a = &apis_array[i];
-		if (a->prefixlen == length && !strcasecmp(a->prefix, prefix))
-			return i;
-	}
-	return -1;
-}
-
-int afb_apis_add_plugin(const char *path)
+int afb_apis_add(const char *name, struct afb_api api)
 {
 	struct api_desc *apis;
-	AFB_plugin *plugin;
-	AFB_plugin *(*pluginRegisterFct) (void);
-	void *handle;
 	size_t len;
+	int i;
 
-	// This is a loadable library let's check if it's a plugin
-	handle = dlopen(path, RTLD_NOW | RTLD_LOCAL);
-	if (handle == NULL) {
-		fprintf(stderr, "[%s] not loadable, continuing...\n", path);
+	/* check existing or not */
+	len = strlen(name);
+	if (len == 0) {
+		fprintf(stderr, "empty api name forbidden\n");
 		goto error;
 	}
 
-	/* retrieves the register function */
-	pluginRegisterFct = dlsym(handle, plugin_register_function);
-	if (!pluginRegisterFct) {
-		fprintf(stderr, "[%s] not an AFB plugin, continuing...\n", path);
-		goto error2;
+	/* check previously existing plugin */
+	for (i = 0 ; i < apis_count ; i++) {
+		if (!strcasecmp(apis_array[i].name, name)) {
+			fprintf(stderr, "ERROR: api of name %s already exists\n", name);
+			goto error;
+		}
 	}
-	if (verbose)
-		fprintf(stderr, "[%s] is a valid AFB plugin\n", path);
 
 	/* allocates enough memory */
 	apis = realloc(apis_array, ((unsigned)apis_count + 1) * sizeof * apis);
 	if (apis == NULL) {
-		fprintf(stderr, "ERROR: plugin [%s] memory missing. continuing...\n", path);
-		goto error2;
+		fprintf(stderr, "out of memory\n");
+		goto error;
 	}
 	apis_array = apis;
 
-	/* init the plugin */
-	plugin = pluginRegisterFct();
-	if (plugin == NULL) {
-		fprintf(stderr, "ERROR: plugin [%s] register function failed. continuing...\n", path);
-		goto error2;
-	}
-
-	/* check the returned structure */
-	if (plugin->type != AFB_PLUGIN_JSON) {
-		fprintf(stderr, "ERROR: plugin [%s] invalid type %d...\n", path, plugin->type);
-		goto error2;
-	}
-	if (plugin->prefix == NULL || *plugin->prefix == 0) {
-		fprintf(stderr, "ERROR: plugin [%s] bad prefix...\n", path);
-		goto error2;
-	}
-	if (plugin->info == NULL || *plugin->info == 0) {
-		fprintf(stderr, "ERROR: plugin [%s] bad description...\n", path);
-		goto error2;
-	}
-	if (plugin->apis == NULL) {
-		fprintf(stderr, "ERROR: plugin [%s] no APIs...\n", path);
-		goto error2;
-	}
-
-	/* check previously existing plugin */
-	len = strlen(plugin->prefix);
-	if (afb_apis_get_apiidx(plugin->prefix, len) >= 0) {
-		fprintf(stderr, "ERROR: plugin [%s] prefix %s duplicated...\n", path, plugin->prefix);
-		goto error2;
-	}
-
 	/* record the plugin */
-	if (verbose)
-		fprintf(stderr, "Loading plugin[%lu] prefix=[%s] info=%s\n", (unsigned long)apis_count, plugin->prefix, plugin->info);
 	apis = &apis_array[apis_count];
-	apis->plugin = plugin;
-	apis->prefixlen = len;
-	apis->prefix = plugin->prefix;
-	apis->handle = handle;
+	apis->api = api;
+	apis->namelen = len;
+	apis->name = name;
 	apis_count++;
 
 	return 0;
 
-error2:
-	dlclose(handle);
 error:
 	return -1;
 }
 
-static int adddirs(char path[PATH_MAX], size_t end)
+void afb_apis_call(struct afb_req req, struct AFB_clientCtx *context, const char *api, size_t lenapi, const char *verb, size_t lenverb)
 {
-	int rc;
-	DIR *dir;
-	struct dirent ent, *result;
-	size_t len;
-
-	/* open the DIR now */
-	dir = opendir(path);
-	if (dir == NULL) {
-		fprintf(stderr, "ERROR in scanning plugin directory %s, %m\n", path);
-		return -1;
-	}
-	if (verbose)
-		fprintf(stderr, "Scanning dir=[%s] for plugins\n", path);
-
-	/* scan each entry */
-	if (end)
-		path[end++] = '/';
-	for (;;) {
-		readdir_r(dir, &ent, &result);
-		if (result == NULL)
-			break;
+	int i;
+	const struct api_desc *a;
 
-		len = strlen(ent.d_name);
-		if (len + end >= PATH_MAX) {
-			fprintf(stderr, "path too long for %s\n", ent.d_name);
-			continue;
-		}
-		memcpy(&path[end], ent.d_name, len+1);
-		if (ent.d_type == DT_DIR) {
-			/* case of directories */
-			if (ent.d_name[0] == '.') {
-				if (len == 1)
-					continue;
-				if (ent.d_name[1] == '.' && len == 2)
-					continue;
-			}
-			rc = adddirs(path, end+len);;
-		} else if (ent.d_type == DT_REG) {
-			/* case of files */
-			if (!strstr(ent.d_name, ".so"))
-				continue;
-			rc = afb_apis_add_plugin(path);
+	a = apis_array;
+	for (i = 0 ; i < apis_count ; i++, a++) {
+		if (a->namelen == lenapi && !strncasecmp(a->name, api, lenapi)) {
+			req.context = &context->contexts[i];
+			a->api.call(a->api.closure, req, verb, lenverb);
+			return;
 		}
 	}
-	closedir(dir);
-	return 0;
-}
-
-int afb_apis_add_directory(const char *path)
-{
-	size_t length;
-	char buffer[PATH_MAX];
-
-	length = strlen(path);
-	if (length >= sizeof(buffer)) {
-		fprintf(stderr, "path too long %lu [%.99s...]\n", (unsigned long)length, path);
-		return -1;
-	}
-
-	memcpy(buffer, path, length + 1);
-	return adddirs(buffer, length);
-}
-
-int afb_apis_add_path(const char *path)
-{
-	struct stat st;
-	int rc;
-
-	rc = stat(path, &st);
-	if (rc < 0)
-		fprintf(stderr, "Invalid plugin path [%s]: %m\n", path);
-	else if (S_ISDIR(st.st_mode))
-		rc = afb_apis_add_directory(path);
-	else
-		rc = afb_apis_add_plugin(path);
-	return rc;
-}
-
-int afb_apis_add_pathset(const char *pathset)
-{
-	static char sep[] = ":";
-	char *ps, *p;
-	int rc;
-
-	ps = strdupa(pathset);
-	for (;;) {
-		p = strsep(&ps, sep);
-		if (!p)
-			return 0;
-		rc = afb_apis_add_path(p);
-	};
+	afb_req_fail(req, "fail", "api not found");
 }