return container_of(process, struct process_info, process);
}
+struct process *procinfo_get_process(struct process_info *procinfo)
+{
+ return &procinfo->process;
+}
+
/* Read as much as possible into the currently-allocated stdout buffer, and
* possibly realloc it for the next read
+ * If the line pointer is not NULL, it is set to the start of the latest
+ * output.
*
* Returns:
* > 0 on success (even though no bytes may have been read)
* 0 on EOF (no error, but no more reads can be performed)
* < 0 on error
**/
-static int process_read_stdout_once(struct process_info *procinfo)
+static int process_read_stdout_once(struct process_info *procinfo, char **line)
{
struct process *process = &procinfo->process;
int rc, fd, max_len;
return rc;
}
+ if (line)
+ *line = process->stdout_buf + process->stdout_len;
+
process->stdout_len += rc;
if (process->stdout_len == procinfo->stdout_buf_len - 1) {
procinfo->stdout_buf_len *= 2;
{
int rc;
- if (!procinfo->process.keep_stdout)
+ if (!procinfo->process.keep_stdout || procinfo->process.raw_stdout)
return 0;
procinfo->stdout_buf_len = 4096;
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]);
{
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
return 0;
do {
- rc = process_read_stdout_once(procinfo);
+ rc = process_read_stdout_once(procinfo, NULL);
} while (rc > 0);
process_finish_stdout(procinfo);
struct process_info *procinfo = arg;
int rc;
- rc = process_read_stdout_once(procinfo);
+ rc = process_read_stdout_once(procinfo, NULL);
+
+ /* if we're going to signal to the waitset that we're done (ie, non-zero
+ * return value), then the waiters will remove us, so we drop the
+ * reference */
+ if (rc < 0) {
+ talloc_unlink(procset, procinfo);
+ procinfo->stdout_waiter = NULL;
+ rc = -1;
+ } else {
+ rc = 0;
+ }
+
+ return rc;
+}
+
+int process_stdout_custom(struct process_info *procinfo, char **line)
+{
+ int rc;
+
+ rc = process_read_stdout_once(procinfo, line);
/* if we're going to signal to the waitset that we're done (ie, non-zero
* return value), then the waiters will remove us, so we drop the
int process_run_async(struct process *process)
{
struct process_info *procinfo = get_info(process);
+ waiter_cb stdout_cb;
int rc;
rc = process_run_common(procinfo);
return rc;
if (process->keep_stdout) {
+ stdout_cb = process->stdout_cb ?: process_stdout_cb;
procinfo->stdout_waiter = waiter_register_io(procset->waitset,
procinfo->stdout_pipe[0],
- WAIT_IN, process_stdout_cb,
- procinfo);
+ WAIT_IN, stdout_cb, procinfo);
talloc_reference(procset, procinfo);
}
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[])