X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so.c;h=5a7f29cf3f83f9ac2522a8f61e5ea4198dc7a1ce;hb=c4c474c056cd070706d5a3b0af7845c9493bfdaf;hp=d673d0eba94d485ec07615ebd36ef36a603f5071;hpb=63c32ff0f0ee13b505d252821fe1fd55816699e1;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-api-so.c b/src/afb-api-so.c
index d673d0eb..5a7f29cf 100644
--- a/src/afb-api-so.c
+++ b/src/afb-api-so.c
@@ -16,7 +16,6 @@
  */
 
 #define _GNU_SOURCE
-#define NO_BINDING_VERBOSE_MACRO
 
 #include <stdio.h>
 #include <dlfcn.h>
@@ -27,23 +26,46 @@
 
 #include "afb-api-so.h"
 #include "afb-api-so-v1.h"
+#include "afb-api-so-v2.h"
 #include "verbose.h"
+#include "sig-monitor.h"
 
-int afb_api_so_timeout = 15;
+struct safe_dlopen
+{
+	const char *path;
+	void *handle;
+	int flags;
+};
 
-void afb_api_so_set_timeout(int to)
+static void safe_dlopen_cb(int sig, void *closure)
 {
-	afb_api_so_timeout = to;
+	struct safe_dlopen *sd = closure;
+	if (!sig)
+		sd->handle = dlopen(sd->path, sd->flags);
+	else {
+		ERROR("dlopen of %s raised signal %s", sd->path, strsignal(sig));
+		sd->handle = NULL;
+	}
 }
 
-static int load_binding(const char *path, int force)
+static void *safe_dlopen(const char *filename, int flags)
+{
+	struct safe_dlopen sd;
+	sd.path = filename;
+	sd.flags = flags;
+	sd.handle = NULL;
+	sig_monitor(0, safe_dlopen_cb, &sd);
+	return sd.handle;
+}
+
+static int load_binding(const char *path, int force, struct afb_apiset *apiset)
 {
 	int rc;
 	void *handle;
 
 	// This is a loadable library let's check if it's a binding
 	rc = -!!force;
-	handle = dlopen(path, RTLD_NOW | RTLD_LOCAL);
+	handle = safe_dlopen(path, RTLD_NOW | RTLD_LOCAL);
 	if (handle == NULL) {
 		if (force)
 			ERROR("binding [%s] not loadable: %s", path, dlerror());
@@ -52,21 +74,29 @@ static int load_binding(const char *path, int force)
 		goto error;
 	}
 
-	/* retrieves the register function */
-	rc = afb_api_so_v1_add(path, handle);
+	/* try the version 2 */
+	rc = afb_api_so_v2_add(path, handle, apiset);
 	if (rc < 0) {
-		/* error when loading a valid v& binding */
+		/* error when loading a valid v2 binding */
 		goto error2;
 	}
-	if (rc == 0) {
-		/* not a v1 binding */
-		if (force)
-			ERROR("binding [%s] is not an AFB binding", path);
-		else
-			INFO("binding [%s] is not an AFB binding", path);
+	if (rc)
+		return 0; /* yes version 2 */
+
+	/* try the version 1 */
+	rc = afb_api_so_v1_add(path, handle, apiset);
+	if (rc < 0) {
+		/* error when loading a valid v1 binding */
 		goto error2;
 	}
-	return 0;
+	if (rc)
+		return 0; /* yes version 1 */
+
+	/* not a valid binding */
+	if (force)
+		ERROR("binding [%s] is not an AFB binding", path);
+	else
+		INFO("binding [%s] is not an AFB binding", path);
 
 error2:
 	dlclose(handle);
@@ -75,12 +105,12 @@ error:
 }
 
 
-int afb_api_so_add_binding(const char *path)
+int afb_api_so_add_binding(const char *path, struct afb_apiset *apiset)
 {
-	return load_binding(path, 1);
+	return load_binding(path, 1, apiset);
 }
 
-static int adddirs(char path[PATH_MAX], size_t end)
+static int adddirs(char path[PATH_MAX], size_t end, struct afb_apiset *apiset)
 {
 	DIR *dir;
 	struct dirent *dent;
@@ -115,18 +145,18 @@ static int adddirs(char path[PATH_MAX], size_t end)
 			/* case of directories */
 			if (dent->d_name[0] == '.') {
 				if (len == 1)
-					continue;
+					continue; /* . */
 				if (dent->d_name[1] == '.' && len == 2)
-					continue;
+					continue; /* .. */
 			}
 			memcpy(&path[end], dent->d_name, len+1);
-			adddirs(path, end+len);;
+			adddirs(path, end+len, apiset);
 		} else if (dent->d_type == DT_REG) {
 			/* case of files */
 			if (memcmp(&dent->d_name[len - 3], ".so", 4))
 				continue;
 			memcpy(&path[end], dent->d_name, len+1);
-			if (load_binding(path, 0) < 0)
+			if (load_binding(path, 0, apiset) < 0)
 				return -1;
 		}
 	}
@@ -134,7 +164,7 @@ static int adddirs(char path[PATH_MAX], size_t end)
 	return 0;
 }
 
-int afb_api_so_add_directory(const char *path)
+int afb_api_so_add_directory(const char *path, struct afb_apiset *apiset)
 {
 	size_t length;
 	char buffer[PATH_MAX];
@@ -146,10 +176,10 @@ int afb_api_so_add_directory(const char *path)
 	}
 
 	memcpy(buffer, path, length + 1);
-	return adddirs(buffer, length);
+	return adddirs(buffer, length, apiset);
 }
 
-int afb_api_so_add_path(const char *path)
+int afb_api_so_add_path(const char *path, struct afb_apiset *apiset)
 {
 	struct stat st;
 	int rc;
@@ -158,15 +188,15 @@ int afb_api_so_add_path(const char *path)
 	if (rc < 0)
 		ERROR("Invalid binding path [%s]: %m", path);
 	else if (S_ISDIR(st.st_mode))
-		rc = afb_api_so_add_directory(path);
+		rc = afb_api_so_add_directory(path, apiset);
 	else if (strstr(path, ".so"))
-		rc = load_binding(path, 0);
+		rc = load_binding(path, 0, apiset);
 	else
 		INFO("not a binding [%s], skipped", path);
 	return rc;
 }
 
-int afb_api_so_add_pathset(const char *pathset)
+int afb_api_so_add_pathset(const char *pathset, struct afb_apiset *apiset)
 {
 	static char sep[] = ":";
 	char *ps, *p;
@@ -176,7 +206,7 @@ int afb_api_so_add_pathset(const char *pathset)
 		p = strsep(&ps, sep);
 		if (!p)
 			return 0;
-		if (afb_api_so_add_path(p) < 0)
+		if (afb_api_so_add_path(p, apiset) < 0)
 			return -1;
 	}
 }