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/pies.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/pies.h')
-rw-r--r-- | src/pies.h | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -177,14 +177,13 @@ enum pies_comp_mode /* Restart the component wherever it terminates */ pies_comp_respawn = pies_comp_exec, }; #define PIES_COMP_DEFAULT 0 -#define PIES_COMP_WAIT 0x01 -#define PIES_COMP_MASK(m) (1 << ((m)+1)) +#define PIES_COMP_MASK(m) (1 << ((m))) #define CF_DISABLED 0x001 /* The componenet is disabled */ #define CF_PRECIOUS 0x002 /* The component is precious (should not be disabled) */ #define CF_WAIT 0x004 /* Wait for the component instance to terminate. */ @@ -314,12 +313,18 @@ void config_file_add_type (enum config_syntax_type syntax, const char *name); void free_redirector (struct redirector *rp); void pies_schedule_action (int act); void free_action (struct action *act); +#define PIES_CHLD_NONE 0 +#define PIES_CHLD_CLEANUP 0x01 +#define PIES_CHLD_WAKEUP 0x02 + +void pies_schedule_children (int op); + void register_prog (struct component *comp); int progman_waiting_p (void); void progman_start (void); void progman_wake_sleeping (int); void progman_stop (void); void progman_cleanup (int expect_term); @@ -509,13 +514,13 @@ int inittrans (void); int is_comp_wait (struct component *comp); int is_valid_runlevel (int c); int console_open (int mode); int telinit (const char *arg); int inittab_parse (const char *file); int sysvinit_sigtrans (int sig, int *pact); -void sysvinit_runlevel_setup (int mask, int *wait); +void sysvinit_runlevel_setup (int mask); void sysvinit_sysdep_begin (void); void sysvinit_power (void); void sysvinit_report (struct json_value *obj); int sysvinit_set_runlevel (int newlevel); |