X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fprocess%2Fprocess.c;h=c1606a52b342406de99d44d9cd07a678a327ba29;hp=93fd9c90b9bff4c8c67f0dcf02039d04c8adfd56;hb=2914110af0cc490566446f18c929452368121b98;hpb=0ba871a497f156dd474a333889cd92eaab9b08dc

diff --git a/lib/process/process.c b/lib/process/process.c
index 93fd9c9..c1606a5 100644
--- a/lib/process/process.c
+++ b/lib/process/process.c
@@ -114,7 +114,7 @@ static int process_setup_stdout_pipe(struct process_info *procinfo)
 {
 	int rc;
 
-	if (!procinfo->process.keep_stdout)
+	if (!procinfo->process.keep_stdout || procinfo->process.raw_stdout)
 		return 0;
 
 	procinfo->stdout_buf_len = 4096;
@@ -132,7 +132,7 @@ static int process_setup_stdout_pipe(struct process_info *procinfo)
 
 static void process_setup_stdout_parent(struct process_info *procinfo)
 {
-	if (!procinfo->process.keep_stdout)
+	if (!procinfo->process.keep_stdout || procinfo->process.raw_stdout)
 		return;
 
 	close(procinfo->stdout_pipe[1]);
@@ -142,6 +142,9 @@ static void process_setup_stdout_child(struct process_info *procinfo)
 {
 	int log = fileno(pb_log_get_stream());
 
+	if (procinfo->process.raw_stdout)
+		return;
+
 	if (procinfo->process.keep_stdout)
 		dup2(procinfo->stdout_pipe[1], STDOUT_FILENO);
 	else
@@ -440,8 +443,29 @@ int process_run_async(struct process *process)
 
 void process_stop_async(struct process *process)
 {
+	/* Avoid signalling an old pid */
+	if (process->cancelled)
+		return;
+
 	pb_debug("process: sending SIGTERM to pid %d\n", process->pid);
 	kill(process->pid, SIGTERM);
+	process->cancelled = true;
+}
+
+void process_stop_async_all(void)
+{
+	struct process_info *procinfo;
+	struct process *process = NULL;
+
+	pb_debug("process: cancelling all async jobs\n");
+
+	list_for_each_entry(&procset->async_list, procinfo, async_list) {
+		process = &procinfo->process;
+		/* Ignore the process completion - callbacks may use stale data */
+		process->exit_cb = NULL;
+		process->stdout_cb = NULL;
+		process_stop_async(process);
+	}
 }
 
 int process_run_simple_argv(void *ctx, const char *argv[])