Skip to content

Commit

Permalink
process: Cancel all asynchronous jobs on reinit
Browse files Browse the repository at this point in the history
If an asynchronous job is running over a reinit, the process can return
and run its callback function after the reinit. This becomes a problem
if the callback function accesses pointers that were only valid before
the reinit (eg. device structs).
If a reinit is requested explicitly stop all active asynchronous jobs
and clear their callback functions before the reinit.

Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
  • Loading branch information
sammj committed Jan 31, 2017
1 parent 75e8929 commit d94bb8c
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 0 deletions.
3 changes: 3 additions & 0 deletions discover/device-handler.c
Expand Up @@ -358,6 +358,9 @@ void device_handler_reinit(struct device_handler *handler)
handler->pending_boot_is_default = false;
}

/* Cancel any remaining async jobs */
process_stop_async_all();

/* free unresolved boot options */
list_for_each_entry_safe(&handler->unresolved_boot_options,
opt, tmp, list)
Expand Down
21 changes: 21 additions & 0 deletions lib/process/process.c
Expand Up @@ -440,8 +440,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[])
Expand Down
2 changes: 2 additions & 0 deletions lib/process/process.h
Expand Up @@ -45,6 +45,7 @@ struct process {

/* post-execution information */
int exit_status;
bool cancelled;
};

/* Process management system init. process_init must be called before
Expand Down Expand Up @@ -77,6 +78,7 @@ int process_run_simple(void *ctx, const char *name, ...)
int process_run_async(struct process *process);

void process_stop_async(struct process *process);
void process_stop_async_all(void);

/* helper function to determine if a process exited cleanly, with a non-zero
* exit status */
Expand Down

0 comments on commit d94bb8c

Please sign in to comment.