diff options
Diffstat (limited to 'src/comp.c')
-rw-r--r-- | src/comp.c | 20 |
1 files changed, 13 insertions, 7 deletions
@@ -350,22 +350,28 @@ component_config_rollback (void) component_free (list->head); cur = prev_index (); } + +/* Return true if PROG is a leftover from previous configuration */ +static int +prog_is_leftover (struct prog *prog) +{ + return IS_COMPONENT (prog) && !component_is_active (prog->v.p.comp); +} +/* If PROG is a leftover, gracefully stop it and mark as disabled */ static int cb_terminate_prog (struct prog *prog, void *data) { - if (IS_COMPONENT (prog) && !component_is_active (prog->v.p.comp)) - { - progman_stop_component (prog); - prog->v.p.comp->flags |= CF_DISABLED; - } + if (prog_is_leftover (prog)) + progman_stop_component (&prog); return 0; } +/* If PROG is a leftover, slay it with SIGKILL */ static int cb_kill_prog (struct prog *prog, void *data) { - if (!(IS_COMPONENT (prog) && component_is_active (prog->v.p.comp))) + if (prog_is_leftover (prog)) prog_stop (prog, SIGKILL); return 0; } @@ -509,7 +515,7 @@ component_config_commit (void) progman_wait_until (list_is_empty, list); } } - + /* Build dependency map */ component_build_depmap (); |