X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.c;h=b42f2ab657ec41756103ff3cd1fe4549ea1dcb5d;hb=ca208671cc79bbc05c574df788035878e5d39382;hp=f73cfac0e939cc2bfb4c772d9042e2e09ff6ba28;hpb=fe79c7ba875a9203020e72e82fa3524fd2fb74d2;p=src%2Fapp-framework-binder.git

diff --git a/src/main.c b/src/main.c
index f73cfac0..b42f2ab6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -21,10 +21,12 @@
 #include <signal.h>
 #include <getopt.h>
 #include <pwd.h>
+#include <pthread.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
 #include "local-def.h"
+#include "afb-apis.h"
 
 #if !defined(PLUGIN_INSTALL_DIR)
 #error "you should define PLUGIN_INSTALL_DIR"
@@ -414,6 +416,36 @@ void signalQuit (int signum) {
 }
 
 
+/*----------------------------------------------------------
+ | Error signals
+ |
+ +--------------------------------------------------------- */
+__thread sigjmp_buf *error_handler;
+static void signalError(int signum)
+{
+	sigset_t sigset;
+
+	// unlock signal to allow a new signal to come
+	sigemptyset(&sigset);
+	sigaddset(&sigset, signum);
+	sigprocmask(SIG_UNBLOCK, &sigset, 0);
+	if (error_handler != NULL) {
+		longjmp(*error_handler, signum);
+	}
+}
+
+static void install_error_handlers()
+{
+	int i, signals[] = { SIGALRM, SIGSEGV, SIGFPE, 0 };
+
+	for (i = 0; signals[i] != 0; i++) {
+		if (signal(signals[i], signalError) == SIG_ERR) {
+			fprintf(stderr, "Signal handler error\n");
+			exit(1);
+		}
+	}
+}
+
 /*----------------------------------------------------------
  | listenLoop
  |   Main listening HTTP loop
@@ -503,8 +535,6 @@ int main(int argc, char *argv[])  {
   on_exit(closeSession, session);
   parse_arguments(argc, argv, session);
 
-  initPlugins(session);
-
   // ------------------ sanity check ----------------------------------------
   if  ((session->background) && (session->foreground)) {
     fprintf (stderr, "ERR: cannot select foreground & background at the same time\n");
@@ -515,6 +545,13 @@ int main(int argc, char *argv[])  {
      exit (1);
   }
 
+  if (session->config->ldpaths) 
+    afb_apis_add_pathset(session->config->ldpaths);
+
+  ctxStoreInit(CTX_NBCLIENTS);
+
+  install_error_handlers();
+
   // ------------------ Some useful default values -------------------------
   if  ((session->background == 0) && (session->foreground == 0)) session->foreground=1;