X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain-afb-daemon.c;h=165d140087842a43d828244fb8a2284066b93323;hb=9a623c3aa32ec0fbf9682f37a990abd00f38da60;hp=7b92905fbb12358911322b99dc8be6b0dc68dc8b;hpb=248ec5dafada74c829dbe197888166c5807e22e2;p=src%2Fapp-framework-binder.git

diff --git a/src/main-afb-daemon.c b/src/main-afb-daemon.c
index 7b92905f..165d1400 100644
--- a/src/main-afb-daemon.c
+++ b/src/main-afb-daemon.c
@@ -403,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)
@@ -421,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;
 		}
@@ -649,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;