Detect if a child stopped working by checking if their stderr pipe
was closed instead of checking their state with waitpid.
As waitpid is not fully working in Windows, this is an approach which
allows for better cross platform operation. (It's less code, too)
Previously we did not close the read pipe of finished children, which we
do now.
The old way missed some messages on an early abort. We just killed the
children and did not bother to look what was left over. With this approach
we'd send a signal to the children and wait for them to close the pipe to
have all the messages (including possible "killed by signal 15" messages).
To have the test suite passing as before, we allow for real graceful
abortion now. In case the user wishes to abort parallel execution
the user needs to provide either the signal used to kill all children
or the children are let run until they finish normally.
Signed-off-by: Stefan Beller <sbeller@xxxxxxxxxx>
---
Hi,
this applis on top of origin/sb/submodule-parallel-fetch,
making Windows folks possibly even more happy. It makes the code easier
to read and has less races on cleaning up a terminated child.
It follows the idea of Johannes patch, instead of encoding information in .err
I removed the in_use flag and added a state, currently having 3 states.
Thanks,
Stefan
Johannes schrieb:
> First let me say that I find it very questionable that the callbacks
> receive a struct child_process.
I tried to get rid of the child_process struct in the callbacks, but that's
not as easy as one may think. The submodule fetch code looks like this:
get_next_submodule(..) {
...
child_process_init(cp);
cp->dir = strbuf_detach(&submodule_path, NULL);
cp->env = local_repo_env;
cp->git_cmd = 1;
if (!spf->quiet)
strbuf_addf(err, "Fetching submodule %s%s\n",
spf->prefix, ce->name);
argv_array_init(&cp->args);
argv_array_pushv(&cp->args, spf->args.argv);
argv_array_push(&cp->args, default_argv);
argv_array_push(&cp->args, "--submodule-prefix");
argv_array_push(&cp->args, submodule_prefix.buf);
}
So we need to have access to the args, and git_cmd, environment variables
and the directory where to run the command in. (So quite a lot of the
internals already)
run-command.c | 140 +++++++++++++++++++++++------------------------------
run-command.h | 12 +++--
submodule.c | 3 --
test-run-command.c | 3 --
4 files changed, 69 insertions(+), 89 deletions(-)
diff --git a/run-command.c b/run-command.c
index 1fbd286..cf17baf 100644
--- a/run-command.c
+++ b/run-command.c
@@ -858,6 +858,12 @@ int capture_command(struct child_process *cmd, struct strbuf *buf, size_t hint)
return finish_command(cmd);
}
+enum child_state {
+ FREE,
+ WORKING,
+ WAIT_CLEANUP,
+};
+
static struct parallel_processes {
void *data;
@@ -869,7 +875,7 @@ static struct parallel_processes {
task_finished_fn task_finished;
struct {
- unsigned in_use : 1;
+ enum child_state state;
struct child_process process;
struct strbuf err;
void *data;
@@ -923,7 +929,7 @@ static void kill_children(struct parallel_processes *pp, int signo)
int i, n = pp->max_processes;
for (i = 0; i < n; i++)
- if (pp->children[i].in_use)
+ if (pp->children[i].state == WORKING)
kill(pp->children[i].process.pid, signo);
}
@@ -967,7 +973,7 @@ static struct parallel_processes *pp_init(int n,
for (i = 0; i < n; i++) {
strbuf_init(&pp->children[i].err, 0);
child_process_init(&pp->children[i].process);
- pp->pfd[i].events = POLLIN;
+ pp->pfd[i].events = POLLIN | POLLHUP;
pp->pfd[i].fd = -1;
}
sigchain_push_common(handle_children_on_signal);
@@ -1011,41 +1017,48 @@ static void set_nonblocking(int fd)
* 0 if a new task was started.
* 1 if no new jobs was started (get_next_task ran out of work, non critical
* problem with starting a new command)
- * -1 no new job was started, user wishes to shutdown early.
+ * <0 no new job was started, user wishes to shutdown early. Use negative code
+ * to signal the children.
*/
static int pp_start_one(struct parallel_processes *pp)
{
- int i;
+ int i, code;
for (i = 0; i < pp->max_processes; i++)
- if (!pp->children[i].in_use)
+ if (pp->children[i].state == FREE)
break;
if (i == pp->max_processes)
die("BUG: bookkeeping is hard");
- if (!pp->get_next_task(&pp->children[i].data,
- &pp->children[i].process,
- &pp->children[i].err,
- pp->data)) {
+ code = pp->get_next_task(&pp->children[i].data,
+ &pp->children[i].process,
+ &pp->children[i].err,
+ pp->data);
+ if (!code) {
strbuf_addbuf(&pp->buffered_output, &pp->children[i].err);
strbuf_reset(&pp->children[i].err);
return 1;
}
+ pp->children[i].process.err = -1;
+ pp->children[i].process.stdout_to_stderr = 1;
+ pp->children[i].process.no_stdin = 1;
if (start_command(&pp->children[i].process)) {
- int code = pp->start_failure(&pp->children[i].process,
- &pp->children[i].err,
- pp->data,
- &pp->children[i].data);
+ code = pp->start_failure(&pp->children[i].process,
+ &pp->children[i].err,
+ pp->data,
+ &pp->children[i].data);
strbuf_addbuf(&pp->buffered_output, &pp->children[i].err);
strbuf_reset(&pp->children[i].err);
- return code ? -1 : 1;
+ if (code)
+ pp->shutdown = 1;
+ return code;
}
set_nonblocking(pp->children[i].process.err);
pp->nr_processes++;
- pp->children[i].in_use = 1;
+ pp->children[i].state = WORKING;
pp->pfd[i].fd = pp->children[i].process.err;
return 0;
}
@@ -1063,19 +1076,24 @@ static void pp_buffer_stderr(struct parallel_processes *pp, int output_timeout)
/* Buffer output from all pipes. */
for (i = 0; i < pp->max_processes; i++) {
- if (pp->children[i].in_use &&
- pp->pfd[i].revents & POLLIN)
- if (strbuf_read_once(&pp->children[i].err,
- pp->children[i].process.err, 0) < 0)
+ if (pp->children[i].state == WORKING &&
+ pp->pfd[i].revents & (POLLIN | POLLHUP)) {
+ int n = strbuf_read_once(&pp->children[i].err,
+ pp->children[i].process.err, 0);
+ if (n == 0) {
+ close(pp->children[i].process.err);
+ pp->children[i].state = WAIT_CLEANUP;
+ } else if (n < 0)
if (errno != EAGAIN)
die_errno("read");
+ }
}
}
static void pp_output(struct parallel_processes *pp)
{
int i = pp->output_owner;
- if (pp->children[i].in_use &&
+ if (pp->children[i].state == WORKING &&
pp->children[i].err.len) {
fputs(pp->children[i].err.buf, stderr);
strbuf_reset(&pp->children[i].err);
@@ -1084,68 +1102,30 @@ static void pp_output(struct parallel_processes *pp)
static int pp_collect_finished(struct parallel_processes *pp)
{
- int i = 0;
- pid_t pid;
- int wait_status, code;
+ int i, code;
int n = pp->max_processes;
int result = 0;
while (pp->nr_processes > 0) {
- pid = waitpid(-1, &wait_status, WNOHANG);
- if (pid == 0)
- break;
-
- if (pid < 0)
- die_errno("wait");
-
for (i = 0; i < pp->max_processes; i++)
- if (pp->children[i].in_use &&
- pid == pp->children[i].process.pid)
+ if (pp->children[i].state == WAIT_CLEANUP)
break;
if (i == pp->max_processes)
- die("BUG: found a child process we were not aware of");
-
- if (strbuf_read(&pp->children[i].err,
- pp->children[i].process.err, 0) < 0)
- die_errno("strbuf_read");
-
- if (WIFSIGNALED(wait_status)) {
- code = WTERMSIG(wait_status);
- if (!pp->shutdown &&
- code != SIGINT && code != SIGQUIT)
- strbuf_addf(&pp->children[i].err,
- "%s died of signal %d",
- pp->children[i].process.argv[0],
- code);
- /*
- * This return value is chosen so that code & 0xff
- * mimics the exit code that a POSIX shell would report for
- * a program that died from this signal.
- */
- code += 128;
- } else if (WIFEXITED(wait_status)) {
- code = WEXITSTATUS(wait_status);
- /*
- * Convert special exit code when execvp failed.
- */
- if (code == 127) {
- code = -1;
- errno = ENOENT;
- }
- } else {
- strbuf_addf(&pp->children[i].err,
- "waitpid is confused (%s)",
- pp->children[i].process.argv[0]);
- code = -1;
- }
+ break;
+
+ code = finish_command(&pp->children[i].process);
- if (pp->task_finished(code, &pp->children[i].process,
- &pp->children[i].err, pp->data,
- &pp->children[i].data))
- result = 1;
+ code = pp->task_finished(code, &pp->children[i].process,
+ &pp->children[i].err, pp->data,
+ &pp->children[i].data);
+
+ if (code)
+ result = code;
+ if (code < 0)
+ break;
pp->nr_processes--;
- pp->children[i].in_use = 0;
+ pp->children[i].state = FREE;
pp->pfd[i].fd = -1;
child_process_deinit(&pp->children[i].process);
child_process_init(&pp->children[i].process);
@@ -1170,7 +1150,7 @@ static int pp_collect_finished(struct parallel_processes *pp)
* running process time.
*/
for (i = 0; i < n; i++)
- if (pp->children[(pp->output_owner + i) % n].in_use)
+ if (pp->children[(pp->output_owner + i) % n].state == WORKING)
break;
pp->output_owner = (pp->output_owner + i) % n;
}
@@ -1184,7 +1164,7 @@ int run_processes_parallel(int n,
task_finished_fn task_finished,
void *pp_cb)
{
- int i;
+ int i, code;
int output_timeout = 100;
int spawn_cap = 4;
struct parallel_processes *pp;
@@ -1195,12 +1175,12 @@ int run_processes_parallel(int n,
i < spawn_cap && !pp->shutdown &&
pp->nr_processes < pp->max_processes;
i++) {
- int code = pp_start_one(pp);
+ code = pp_start_one(pp);
if (!code)
continue;
if (code < 0) {
pp->shutdown = 1;
- kill_children(pp, SIGTERM);
+ kill_children(pp, -code);
}
break;
}
@@ -1208,9 +1188,11 @@ int run_processes_parallel(int n,
break;
pp_buffer_stderr(pp, output_timeout);
pp_output(pp);
- if (pp_collect_finished(pp)) {
- kill_children(pp, SIGTERM);
+ code = pp_collect_finished(pp);
+ if (code) {
pp->shutdown = 1;
+ if (code < 0)
+ kill_children(pp, -code);
}
}
diff --git a/run-command.h b/run-command.h
index c24aa54..414cc81 100644
--- a/run-command.h
+++ b/run-command.h
@@ -134,6 +134,8 @@ int finish_async(struct async *async);
*
* Return 1 if the next child is ready to run.
* Return 0 if there are currently no more tasks to be processed.
+ * To send a signal to other child processes for abortion,
+ * return negative signal code.
*/
typedef int (*get_next_task_fn)(void **pp_task_cb,
struct child_process *cp,
@@ -151,8 +153,9 @@ typedef int (*get_next_task_fn)(void **pp_task_cb,
* pp_cb is the callback cookie as passed into run_processes_parallel,
* pp_task_cb is the callback cookie as passed into get_next_task_fn.
*
- * Return 0 to continue the parallel processing. To abort gracefully,
- * return non zero.
+ * Return 0 to continue the parallel processing. To abort return non zero.
+ * To send a signal to other child processes for abortion, return
+ * negative signal code.
*/
typedef int (*start_failure_fn)(struct child_process *cp,
struct strbuf *err,
@@ -169,8 +172,9 @@ typedef int (*start_failure_fn)(struct child_process *cp,
* pp_cb is the callback cookie as passed into run_processes_parallel,
* pp_task_cb is the callback cookie as passed into get_next_task_fn.
*
- * Return 0 to continue the parallel processing. To abort gracefully,
- * return non zero.
+ * Return 0 to continue the parallel processing. To abort return non zero.
+ * To send a signal to other child processes for abortion, return
+ * negative signal code.
*/
typedef int (*task_finished_fn)(int result,
struct child_process *cp,
diff --git a/submodule.c b/submodule.c
index c21b265..281bccd 100644
--- a/submodule.c
+++ b/submodule.c
@@ -689,9 +689,6 @@ static int get_next_submodule(void **task_cb, struct child_process *cp,
cp->dir = strbuf_detach(&submodule_path, NULL);
cp->env = local_repo_env;
cp->git_cmd = 1;
- cp->no_stdin = 1;
- cp->stdout_to_stderr = 1;
- cp->err = -1;
if (!spf->quiet)
strbuf_addf(err, "Fetching submodule %s%s\n",
spf->prefix, ce->name);
diff --git a/test-run-command.c b/test-run-command.c
index 13e5d44..b1f04d1 100644
--- a/test-run-command.c
+++ b/test-run-command.c
@@ -26,9 +26,6 @@ static int parallel_next(void** task_cb,
return 0;
argv_array_pushv(&cp->args, d->argv);
- cp->stdout_to_stderr = 1;
- cp->no_stdin = 1;
- cp->err = -1;
strbuf_addf(err, "preloaded output of a child\n");
number_callbacks++;
return 1;
--
2.6.1.247.ge8f2a41.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html