X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=95b5a653445c48a1002cf403cf37e7fe99e50c0b;hb=11d36a9f7e16aa9992835f8ce06f0e1e5297b131;hp=48b5a60164a54f3ed4788cc4782a8edb7069a356;hpb=acdf592fee6d7f1970e42e31c23c2a88196051aa;p=src%2Fapp-framework-binder.git

diff --git a/src/main.c b/src/main.c
index 48b5a601..95b5a653 100644
--- a/src/main.c
+++ b/src/main.c
@@ -16,16 +16,22 @@
  * limitations under the License.
  */
 
-#include <syslog.h>
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <string.h>
+#include <getopt.h>
 #include <setjmp.h>
 #include <signal.h>
-#include <getopt.h>
-#include <pwd.h>
+#include <syslog.h>
+#include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include "afb-plugin.h"
+
 #include "local-def.h"
-#include "afb-plugins.h"
+#include "afb-apis.h"
+#include "session.h"
 
 #if !defined(PLUGIN_INSTALL_DIR)
 #error "you should define PLUGIN_INSTALL_DIR"
@@ -415,6 +421,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
+	if (error_handler != NULL) {
+		sigemptyset(&sigset);
+		sigaddset(&sigset, signum);
+		sigprocmask(SIG_UNBLOCK, &sigset, 0);
+		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
@@ -514,8 +550,12 @@ int main(int argc, char *argv[])  {
      exit (1);
   }
 
-  initPlugins(session);
-  ctxStoreInit(CTX_NBCLIENTS);
+  if (session->config->ldpaths) 
+    afb_apis_add_pathset(session->config->ldpaths);
+
+  ctxStoreInit(CTX_NBCLIENTS, session->config->cntxTimeout, afb_apis_count(), session->config->token);
+
+  install_error_handlers();
 
   // ------------------ Some useful default values -------------------------
   if  ((session->background == 0) && (session->foreground == 0)) session->foreground=1;