diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2016-02-13 23:55:47 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2016-02-14 00:05:33 +0200 |
commit | 0a5eb4f65a20d37f2051dce8816485dd219fb735 (patch) | |
tree | eadff6490ebf734431c354ac1ba40a4a8537fcb0 /src/prog.h | |
parent | c9581808b72ff25623c87cf49c471ce7f017985d (diff) | |
download | pies-0a5eb4f65a20d37f2051dce8816485dd219fb735.tar.gz pies-0a5eb4f65a20d37f2051dce8816485dd219fb735.tar.bz2 |
Fix handling of wait components
* src/pies.h (PIES_COMP_WAIT): Remove.
(PIES_COMP_MASK): Save one bit.
(PIES_CHLD_NONE, PIES_CHLD_CLEANUP)
(PIES_CHLD_WAKEUP): New constants.
(pies_schedule_children): New proto.
(sysvinit_runlevel_setup): Change signature.
* src/pies.c (children_cleanup, got_alarm): Merge into
single static variable children_op. All uses updated.
(pies_schedule_children): New function.
(sig_handler): Update
(main): Don't call ctl_open for init process. It is done
by inittrans after transition from boot to normal state.
Update to use pies_schedule_children.
* src/prog.h (IS_ACTIVE_COMPONENT): New macro.
* src/progman.c (prog_start): Don't modify prog->v.p.wait.
(progman_wake_sleeping): Start usual components only after
all "wait" components have terminated.
(progman_cleanup): If a "wait" component has terminated,
request PIES_CHLD_WAKEUP.
* src/sysvinit.c (enstate) <wait>: Remove.
(enablecomp): Update.
(runlevel_setup_prog): Set prog->v.p.wait.
(sysvinit_runlevel_setup): Take only one parameter.
(inittrans): Remove "wait" and the related mess.
Call ctl_open after transition boot -> normal.
Diffstat (limited to 'src/prog.h')
-rw-r--r-- | src/prog.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -78,12 +78,14 @@ struct prog char *command; } c; } v; }; #define IS_COMPONENT(p) ((p)->type == TYPE_COMPONENT) +#define IS_ACTIVE_COMPONENT(prog) \ + (IS_COMPONENT(prog) && !((prog)->v.p.comp->flags & CF_DISABLED)) struct prog *progman_locate (const char *name); int progman_foreach (int (*filter) (struct prog *, void *data), void *data); void prog_stop (struct prog *prog, int sig); void progman_stop_component (struct prog **prog); |