diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ctl.c | 10 | ||||
| -rw-r--r-- | src/pies.c | 7 | ||||
| -rw-r--r-- | src/pies.h | 16 | ||||
| -rw-r--r-- | src/prog.h | 2 | ||||
| -rw-r--r-- | src/progman.c | 35 | ||||
| -rw-r--r-- | src/sysvinit.c | 94 |
6 files changed, 135 insertions, 29 deletions
@@ -1825,9 +1825,11 @@ prog_serialize (struct json_value *ret, struct prog *prog) prog->v.p.comp->socket_url->string); + if (prog->v.p.comp->runlevels) + json_object_set_string (ret, "runlevels", "%s", + prog->v.p.comp->runlevels); + if (prog->v.p.status == status_sleeping) - { - json_object_set_number (ret, "wakeup-time", - prog->v.p.timestamp + SLEEPTIME); - } + json_object_set_number (ret, "wakeup-time", + prog->v.p.timestamp + SLEEPTIME); v = json_new_array (); @@ -2191,4 +2191,5 @@ main (int argc, char **argv) case ACTION_RELOAD: pies_reload (); + got_alarm = 1; action = ACTION_CONT; break; @@ -2217,4 +2218,10 @@ main (int argc, char **argv) action = ACTION_CONT; break; + + case ACTION_POWER: + debug (1, ("SIGPWR")); + sysvinit_power (); + got_alarm = 1; + action = ACTION_CONT; } if (action == ACTION_CONT) @@ -271,5 +271,6 @@ enum pies_action { ACTION_RELOAD, ACTION_CTRLALTDEL, - ACTION_KBREQUEST + ACTION_KBREQUEST, + ACTION_POWER }; @@ -317,5 +318,5 @@ void free_action (struct action *act); void register_prog (struct component *comp); -int progman_running_p (void); +int progman_waiting_p (void); size_t progman_running_count (void); void progman_start (void); @@ -514,4 +515,5 @@ int sysvinit_sigtrans (int sig, int *pact); void sysvinit_runlevel_setup (int mask, int *wait); void sysvinit_sysdep_begin (void); +void sysvinit_power (void); extern char *sysvinit_environ_hint[]; @@ -522,4 +524,14 @@ extern char *init_fifo; #endif +#ifndef POWER_STAT_FILE +# define POWER_STAT_FILE "/var/run/powerstatus" +#endif + +/* Power status values */ +#define POWER_STAT_FAIL 'F' +#define POWER_STAT_LOW 'L' +#define POWER_STAT_OK 'O' + +/* Request codes */ #define INIT_MAGIC 0x03091969 #define INIT_CMD_START 0 @@ -53,5 +53,5 @@ struct prog { struct component *comp; - size_t idx; /* Numeric identifier */ + int wait; int socket; struct prog *redir[2]; /* Pointers to redirectors */ diff --git a/src/progman.c b/src/progman.c index 3bbd8b3..4ca3824 100644 --- a/src/progman.c +++ b/src/progman.c @@ -115,14 +115,4 @@ progman_lookup_tcpmux (const char *service, const char *master) } -struct prog * -prog_lookup_by_idx (unsigned idx) -{ - struct prog *prog; - for (prog = proghead; prog; prog = prog->next) - if (IS_COMPONENT (prog) && prog->v.p.idx == idx) - break; - return prog; -} - void prog_stop (struct prog *prog, int sig); static int prog_start_prerequisites (struct prog *prog); @@ -306,5 +296,5 @@ register_command (char *tag, char *command, pid_t pid) int -progman_running_p () +progman_waiting_p () { struct prog *prog; @@ -312,7 +302,11 @@ progman_running_p () for (prog = proghead; prog; prog = prog->next) { - if (IS_COMPONENT (prog) && is_comp_wait (prog->v.p.comp) && - prog->pid > 0) - return 1; + if (IS_COMPONENT (prog) && prog->v.p.wait && prog->pid > 0) + { + debug(1, ("%s: waiting for %s (%lu)", + __FUNCTION__, prog_tag (prog), + (unsigned long) prog->pid)); + return 1; + } } return 0; @@ -1060,4 +1054,5 @@ prog_start (struct prog *prog) return; } + prog->v.p.wait = is_comp_wait (prog->v.p.comp); debug (1, ("ok to start %s", prog->v.p.comp->tag)); } @@ -1502,4 +1497,8 @@ progman_start () struct prog *prog; + if (progman_waiting_p ()) + /* Noting to do if there are processes left in the previous runlevel */ + return; + recompute_alarm = 0; debug (1, ("starting components")); @@ -1547,4 +1546,8 @@ progman_wake_sleeping (int onalrm) time_t now = time (NULL); + if (progman_waiting_p ()) + /* Noting to do if there are processes left in the previous runlevel */ + return; + debug (1, (_("managing sleeping/stopping components"))); @@ -2255,4 +2258,7 @@ progman_cleanup (int expect_term) pid_t pid; int status; + + if (!expect_term) + expect_term = progman_waiting_p (); while ((pid = waitpid (-1, &status, WNOHANG)) > 0) { @@ -2305,4 +2311,5 @@ progman_cleanup (int expect_term) pid, ""); prog->v.p.status = status_finished; + prog->v.p.wait = 0; } else diff --git a/src/sysvinit.c b/src/sysvinit.c index d8b7cc5..be7aef8 100644 --- a/src/sysvinit.c +++ b/src/sysvinit.c @@ -403,5 +403,7 @@ sysvinit_setenv (char const *data, int size) char *init_fifo = INIT_FIFO; + static void create_fifo (void); +static void powerfailcmd (int power_stat); static int @@ -457,5 +459,4 @@ sysvinit_fifo_handler (int fd, void *data) if (buf.req.runlevel != runlevel) { - progman_stop (); dfl_level = buf.req.runlevel; inittrans (); @@ -468,4 +469,16 @@ sysvinit_fifo_handler (int fd, void *data) break; + case INIT_CMD_POWERFAIL: + powerfailcmd (POWER_STAT_FAIL); + break; + + case INIT_CMD_POWERFAILNOW: + powerfailcmd (POWER_STAT_LOW); + break; + + case INIT_CMD_POWEROK: + powerfailcmd (POWER_STAT_OK); + break; + /* FIXME: react on other commands */ } @@ -574,4 +587,7 @@ sysvinit_sigtrans (int sig, int *pact) *pact = ACTION_CONT; break; + case SIGPWR: + *pact = ACTION_POWER; + break; default: return 0; @@ -655,5 +671,5 @@ inittrans () static int wait = 0; - if (progman_running_p ()) + if (progman_waiting_p ()) /* Noting to do if there are processes left in the previous runlevel */ return 0; @@ -727,14 +743,16 @@ is_comp_wait (struct component *comp) switch (comp->mode) { - case pies_comp_boot: - case pies_comp_powerfail: - case pies_comp_ctrlaltdel: + case pies_comp_sysinit: + case pies_comp_bootwait: + case pies_comp_wait: + case pies_comp_powerwait: case pies_comp_powerfailnow: - case pies_comp_kbrequest: - return 0; + case pies_comp_powerokwait: + case pies_comp_ctrlaltdel: + return 1; default: break; } - return 1; + return 0; } @@ -972,2 +990,62 @@ inittab_parse (const char *file) return err; } + +char *power_stat_file = POWER_STAT_FILE; + +void +sysvinit_power (void) +{ + int power_stat = POWER_STAT_FAIL; + int fd; + + fd = open (power_stat_file, O_RDONLY); + if (fd >= 0) + { + char c; + switch (read (fd, &c, 1)) + { + case 1: + power_stat = c; + break; + + case 0: + logmsg (LOG_NOTICE, _("unexpected EOF on %s"), power_stat_file); + break; + + case -1: + logmsg (LOG_ERR, _("error reading from %s: %s"), + power_stat_file, strerror (errno)); + } + close (fd); + if (unlink (power_stat_file)) + logmsg (LOG_ERR, _("can't unlink %s: %s"), power_stat_file, + strerror (errno)); + } + else + debug (1, (_("can't open %s: %s"), power_stat_file, strerror (errno))); + + powerfailcmd (power_stat); +} + +static void +powerfailcmd (int power_stat) +{ + int mask; + + switch (power_stat) + { + case POWER_STAT_OK: /* The power is OK */ + mask = PIES_COMP_MASK (pies_comp_powerokwait); + break; + + case POWER_STAT_LOW: /* Low battery: shut down now */ + mask = PIES_COMP_MASK (pies_comp_powerfailnow); + break; + + default: /* Power failure */ + mask = PIES_COMP_MASK (pies_comp_powerfail) + | PIES_COMP_MASK (pies_comp_powerwait); + } + + sysvinit_runlevel_setup (mask, NULL); +} |