X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain-afb-daemon.c;h=3421be819c5fbd3f789c3a7d0a5e0e82be3e3ef8;hb=6f13ad1989875b5a0ce50b24211fd1fba093735f;hp=4fb4792c7248ceff83eaa3bda3fe1772e733905c;hpb=83c9e99afda0f18e01b9f6dead29d81877568ef4;p=src%2Fapp-framework-binder.git

diff --git a/src/main-afb-daemon.c b/src/main-afb-daemon.c
index 4fb4792c..3421be81 100644
--- a/src/main-afb-daemon.c
+++ b/src/main-afb-daemon.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2018 "IoT.bzh"
+ * Copyright (C) 2015-2019 "IoT.bzh"
  * Author "Fulup Ar Foll"
  * Author José Bollo <jose.bollo@iot.bzh>
  *
@@ -38,12 +38,12 @@
 
 #include <systemd/sd-daemon.h>
 
-#include "afb-config.h"
+#include "afb-args.h"
 #include "afb-hswitch.h"
 #include "afb-apiset.h"
 #include "afb-autoset.h"
 #include "afb-api-so.h"
-#if defined(WITH_DBUS_TRANSPARENCY)
+#if WITH_DBUS_TRANSPARENCY
 #   include "afb-api-dbus.h"
 #endif
 #include "afb-api-ws.h"
@@ -55,10 +55,12 @@
 #include "afb-common.h"
 #include "afb-export.h"
 #include "afb-monitor.h"
+#if WITH_AFB_HOOK
 #include "afb-hook.h"
 #include "afb-hook-flags.h"
+#endif
 #include "afb-debug.h"
-#if defined(WITH_SUPERVISION)
+#if WITH_SUPERVISION
 #   include "afb-supervision.h"
 #endif
 
@@ -66,6 +68,11 @@
 #include "wrap-json.h"
 #include "jobs.h"
 #include "sig-monitor.h"
+#include "watchdog.h"
+
+#if !defined(DEFAULT_BINDER_INTERFACE)
+#  define DEFAULT_BINDER_INTERFACE NULL
+#endif
 
 /*
    if SELF_PGROUP == 0 the launched command is the group leader
@@ -351,8 +358,12 @@ static struct afb_hsrv *start_http_server()
 	}
 
 	if (afb_hreq_init_download_path(uploaddir)) {
-		ERROR("unable to set the upload directory %s", uploaddir);
-		return NULL;
+		static const char fallback_uploaddir[] = "/tmp";
+		WARNING("unable to set the upload directory %s", uploaddir);
+		if (afb_hreq_init_download_path(fallback_uploaddir)) {
+			ERROR("unable to fallback to upload directory %s", fallback_uploaddir);
+			return NULL;
+		}
 	}
 
 	hsrv = afb_hsrv_create();
@@ -371,13 +382,20 @@ static struct afb_hsrv *start_http_server()
 	NOTICE("Waiting port=%d rootdir=%s", http_port, rootdir);
 	NOTICE("Browser URL= http://localhost:%d", http_port);
 
-	rc = afb_hsrv_start(hsrv, (uint16_t) http_port, 15);
+	rc = afb_hsrv_start(hsrv, 15);
 	if (!rc) {
 		ERROR("starting of httpd failed");
 		afb_hsrv_put(hsrv);
 		return NULL;
 	}
 
+	rc = afb_hsrv_add_interface_tcp(hsrv, DEFAULT_BINDER_INTERFACE, (uint16_t) http_port);
+	if (!rc) {
+		ERROR("setting interface failed");
+		afb_hsrv_put(hsrv);
+		return NULL;
+	}
+
 	return hsrv;
 }
 
@@ -385,6 +403,27 @@ static struct afb_hsrv *start_http_server()
  | execute_command
  +--------------------------------------------------------- */
 
+static void exit_at_end()
+{
+	exit(0);
+}
+
+static void wait_child(int signum, void* arg)
+{
+	pid_t pid = (pid_t)(intptr_t)arg;
+	pid_t pidchld = childpid;
+
+	if (pidchld == pid) {
+		childpid = 0;
+		if (!SELF_PGROUP)
+			killpg(pidchld, SIGKILL);
+		waitpid(pidchld, NULL, 0);
+		jobs_exit(exit_at_end);
+	} else {
+		waitpid(pid, NULL, 0);
+	}
+}
+
 static void on_sigchld(int signum, siginfo_t *info, void *uctx)
 {
 	if (info->si_pid == childpid) {
@@ -392,11 +431,9 @@ static void on_sigchld(int signum, siginfo_t *info, void *uctx)
 		case CLD_EXITED:
 		case CLD_KILLED:
 		case CLD_DUMPED:
-			childpid = 0;
-			if (!SELF_PGROUP)
-				killpg(info->si_pid, SIGKILL);
-			waitpid(info->si_pid, NULL, 0);
-			exit(0);
+			jobs_queue_lazy(0, 0, wait_child, (void*)(intptr_t)info->si_pid);
+		default:
+			break;
 		}
 	}
 }
@@ -663,7 +700,13 @@ static void run_startup_calls()
 
 static void start(int signum, void *arg)
 {
-	const char *tracereq, *traceapi, *traceevt, *traceses, *tracesvc, *traceditf, *traceglob;
+#if WITH_AFB_HOOK
+	const char *tracereq = NULL, *traceapi = NULL, *traceevt = NULL,
+#if !defined(REMOVE_LEGACY_TRACE)
+		*tracesvc = NULL, *traceditf = NULL,
+#endif
+		*traceses = NULL, *traceglob = NULL;
+#endif
 	const char *workdir, *rootdir, *token, *rootapi;
 	struct json_object *settings;
 	struct afb_hsrv *hsrv;
@@ -680,19 +723,20 @@ static void start(int signum, void *arg)
 	}
 
 	settings = NULL;
-	token = rootapi = tracesvc = traceditf = tracereq =
-		traceapi = traceevt = traceses = traceglob = NULL;
 	no_httpd = 0;
 	http_port = -1;
+	rootapi = token = NULL;
 	rc = wrap_json_unpack(main_config, "{"
 			"ss ss s?s"
 			"si si si"
 			"s?b s?i s?s"
-			"s?o"
+#if WITH_AFB_HOOK
 #if !defined(REMOVE_LEGACY_TRACE)
 			"s?s s?s"
 #endif
 			"s?s s?s s?s s?s s?s"
+#endif
+			"s?o"
 			"}",
 
 			"rootdir", &rootdir,
@@ -707,7 +751,7 @@ static void start(int signum, void *arg)
 			"port", &http_port,
 			"rootapi", &rootapi,
 
-			"set", &settings,
+#if WITH_AFB_HOOK
 #if !defined(REMOVE_LEGACY_TRACE)
 			"tracesvc", &tracesvc,
 			"traceditf", &traceditf,
@@ -716,7 +760,9 @@ static void start(int signum, void *arg)
 			"traceapi", &traceapi,
 			"traceevt", &traceevt,
 			"traceses",  &traceses,
-			"traceglob", &traceglob
+			"traceglob", &traceglob,
+#endif
+			"set", &settings
 			);
 	if (rc < 0) {
 		ERROR("Unable to get start config");
@@ -773,13 +819,14 @@ static void start(int signum, void *arg)
 		ERROR("failed to setup monitor");
 		goto error;
 	}
-#if defined(WITH_SUPERVISION)
+#if WITH_SUPERVISION
 	if (afb_supervision_init(main_apiset, main_config) < 0) {
 		ERROR("failed to setup supervision");
 		goto error;
 	}
 #endif
 
+#if WITH_AFB_HOOK
 	/* install hooks */
 	if (tracereq)
 		afb_hook_create_xreq(NULL, NULL, NULL, afb_hook_flags_xreq_from_text(tracereq), NULL, NULL);
@@ -798,14 +845,17 @@ static void start(int signum, void *arg)
 		afb_hook_create_session(NULL, afb_hook_flags_session_from_text(traceses), NULL, NULL);
 	if (traceglob)
 		afb_hook_create_global(afb_hook_flags_global_from_text(traceglob), NULL, NULL);
+#endif
 
 	/* load bindings and apis */
 	afb_debug("start-load");
+#if WITH_DYNAMIC_BINDING
 	apiset_start_list("binding", afb_api_so_add_binding, "the binding");
 	apiset_start_list("ldpaths", afb_api_so_add_pathset_fails, "the binding path set");
 	apiset_start_list("weak-ldpaths", afb_api_so_add_pathset_nofails, "the weak binding path set");
+#endif
 	apiset_start_list("auto-api", afb_autoset_add_any, "the automatic api path set");
-#if defined(WITH_DBUS_TRANSPARENCY)
+#if WITH_DBUS_TRANSPARENCY
 	apiset_start_list("dbus-client", afb_api_dbus_add_client, "the afb-dbus client");
 #endif
 	apiset_start_list("ws-client", afb_api_ws_add_client_weak, "the afb-websocket client");
@@ -822,7 +872,7 @@ static void start(int signum, void *arg)
 
 	/* export started apis */
 	apiset_start_list("ws-server", afb_api_ws_add_server, "the afb-websocket service");
-#if defined(WITH_DBUS_TRANSPARENCY)
+#if WITH_DBUS_TRANSPARENCY
 	apiset_start_list("dbus-server", afb_api_dbus_add_server, "the afb-dbus service");
 #endif
 
@@ -850,6 +900,13 @@ static void start(int signum, void *arg)
 
 	/* ready */
 	sd_notify(1, "READY=1");
+
+	/* activate the watchdog */
+#if HAS_WATCHDOG
+	if (watchdog_activate() < 0)
+		ERROR("can't start the watchdog");
+#endif
+
 	return;
 error:
 	exit(1);
@@ -866,7 +923,7 @@ int main(int argc, char *argv[])
 	afb_debug("main-entry");
 
 	// ------------- Build session handler & init config -------
-	main_config = afb_config_parse_arguments(argc, argv);
+	main_config = afb_args_parse(argc, argv);
 	if (sig_monitor_init(
 		!json_object_object_get_ex(main_config, "trap-faults", &obj)
 			|| json_object_get_boolean(obj)) < 0) {
@@ -892,7 +949,7 @@ int main(int argc, char *argv[])
 	afb_debug("main-start");
 
 	/* enter job processing */
-	jobs_start(3, 0, 50, start, NULL);
+	jobs_start(3, 0, 100, start, NULL);
 	WARNING("hoops returned from jobs_enter! [report bug]");
 	return 1;
 }