Improve progman API (progman_foreach and progman_stop_component).

* src/progman.c (progman_foreach): Allow filter to remove its prog
argument from the list.  Return integer (result of the call
to filter, that returned non-zero).  All uses changed.
(progman_running_count): Remove.
(progman_stop_component): Take a pointer to
pointer.  Pass it to destroy_prog when needed.  All uses changed.
* src/comp.c (prog_is_leftover): New function.
(cb_terminate_prog): Use prog_is_leftover. Don't raise CF_DISABLED
flag, as prog will have been destroyed by progman_stop_component.
(cb_kill_prog): Use prog_is_leftover.
* src/ctl.c (fun_stop): Check if prog still exists after the
call to progman_stop_component.
* src/pies.h (progman_running_count): Removed.
* src/prog.h (progman_foreach): Return int.
(progman_stop_component): Change signature.

1 files changed, 13 insertions, 7 deletions

diff --git a/src/comp.c b/src/comp.c
index 5613e28..6a0e4ba 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -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 ();