X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain-afb-daemon.c;h=165d140087842a43d828244fb8a2284066b93323;hb=29ae81fa15c6080fd27929f4cc78e1289cb920e9;hp=a85ffc0a6af69cec2249951511e7969bb5b2fba3;hpb=2ba7c200c6c4844b63f8f707a6f04017661f16ca;p=src%2Fapp-framework-binder.git

diff --git a/src/main-afb-daemon.c b/src/main-afb-daemon.c
index a85ffc0a..165d1400 100644
--- a/src/main-afb-daemon.c
+++ b/src/main-afb-daemon.c
@@ -358,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();
@@ -399,15 +403,25 @@ static struct afb_hsrv *start_http_server()
  | execute_command
  +--------------------------------------------------------- */
 
-static void wait_child_and_exit()
+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;
 
-	childpid = 0;
-	if (!SELF_PGROUP)
-		killpg(pidchld, SIGKILL);
-	waitpid(pidchld, NULL, 0);
-	exit(0);
+	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)
@@ -417,7 +431,7 @@ static void on_sigchld(int signum, siginfo_t *info, void *uctx)
 		case CLD_EXITED:
 		case CLD_KILLED:
 		case CLD_DUMPED:
-			jobs_exit(wait_child_and_exit);
+			jobs_queue_lazy(0, 0, wait_child, (void*)(intptr_t)info->si_pid);
 		default:
 			break;
 		}
@@ -645,8 +659,7 @@ static void startup_call_current(struct startup_req *sreq)
 		json = strchr(verb, ':');
 		if (json) {
 			afb_xreq_init(&sreq->xreq, &startup_xreq_itf);
-			afb_context_init(&sreq->xreq.context, sreq->session, NULL);
-			sreq->xreq.context.validated = 1;
+			afb_context_init_validated(&sreq->xreq.context, sreq->session);
 			sreq->api = strndup(api, verb - api);
 			sreq->verb = strndup(verb + 1, json - verb - 1);
 			sreq->xreq.request.called_api = sreq->api;
@@ -835,9 +848,11 @@ static void start(int signum, void *arg)
 
 	/* 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 WITH_DBUS_TRANSPARENCY
 	apiset_start_list("dbus-client", afb_api_dbus_add_client, "the afb-dbus client");
@@ -933,7 +948,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;
 }