summaryrefslogtreecommitdiffabout
path: root/src/progman.c
Side-by-side diff
Diffstat (limited to 'src/progman.c') (more/less context) (ignore whitespace changes)
-rw-r--r--src/progman.c39
1 files changed, 17 insertions, 22 deletions
diff --git a/src/progman.c b/src/progman.c
index 020dccd..2c73b2b 100644
--- a/src/progman.c
+++ b/src/progman.c
@@ -32,13 +32,19 @@ progman_locate (const char *name)
return prog;
}
-void
+int
progman_foreach (int (*filter) (struct prog *, void *data), void *data)
{
struct prog *prog;
- for (prog = proghead; prog; prog = prog->next)
- if (filter (prog, data))
- break;
+ int rc = 0;
+ for (prog = proghead; prog; )
+ {
+ struct prog *next = prog->next;
+ if ((rc = filter (prog, data)) != 0)
+ break;
+ prog = next;
+ }
+ return rc;
}
/* FIXME: Rewrite this using progman_foreach? */
@@ -312,18 +318,6 @@ progman_waiting_p ()
return 0;
}
-size_t
-progman_running_count ()
-{
- size_t size = 0;
- struct prog *prog;
-
- for (prog = proghead; prog; prog = prog->next)
- if (prog->pid > 0)
- size++;
- return size;
-}
-
RETSIGTYPE
redir_exit (int sig)
{
@@ -1742,7 +1736,7 @@ progman_wait_until (int (*cond) (void *), void *data)
static int
no_children_left (void *p)
{
- return progman_running_count () == 0;
+ return proghead == NULL;
}
void
@@ -2357,8 +2351,9 @@ progman_cleanup (int expect_term)
}
void
-progman_stop_component (struct prog *prog)
+progman_stop_component (struct prog **progptr)
{
+ struct prog *prog = *progptr;
if (prog && IS_COMPONENT (prog))
{
switch (prog->v.p.status)
@@ -2371,7 +2366,7 @@ progman_stop_component (struct prog *prog)
case status_disabled:
if (!component_is_active (prog->v.p.comp))
- destroy_prog (&prog);
+ destroy_prog (progptr);
else if (!(prog->v.p.comp->flags & CF_DISABLED))
{
logmsg (LOG_INFO, _("enabling component `%s'"), prog_tag (prog));
@@ -2381,7 +2376,7 @@ progman_stop_component (struct prog *prog)
case status_sleeping:
if (!component_is_active (prog->v.p.comp))
- destroy_prog (&prog);
+ destroy_prog (progptr);
else
{
logmsg (LOG_INFO, _("waking up component `%s'"), prog_tag (prog));
@@ -2391,7 +2386,7 @@ progman_stop_component (struct prog *prog)
default:
if (!component_is_active (prog->v.p.comp))
- destroy_prog (&prog);
+ destroy_prog (progptr);
else
logmsg (LOG_INFO,
_("stopping component `%s': component not started"),
@@ -2404,6 +2399,6 @@ void
progman_stop_tag (const char *name)
{
struct prog *prog = progman_locate (name);
- progman_stop_component (prog);
+ progman_stop_component (&prog);
}
/* EOF */

Return to:

Send suggestions and report system problems to the System administrator.