aboutsummaryrefslogtreecommitdiff
path: root/src/pies.h
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2013-01-04 15:33:00 +0200
committerSergey Poznyakoff <gray@gnu.org.ua>2013-01-04 22:11:21 +0200
commitd8221ce9bdd2d7ae6162bed0e1c85e9f7a3ff8f2 (patch)
tree5fab301e38fede054aa85708c6c8590c1825e541 /src/pies.h
parent95bc9b24928eb9951f0644307e417df0bc8c53b4 (diff)
downloadpies-d8221ce9bdd2d7ae6162bed0e1c85e9f7a3ff8f2.tar.gz
pies-d8221ce9bdd2d7ae6162bed0e1c85e9f7a3ff8f2.tar.bz2
Fix sysvinit transition logic.
* src/pies.c (main): Call sysvinit_begin to initialize sysvinit subsystem. In the main loop, force wakeup if inittrans returns 1. * src/pies.h (is_sysvinit): Rewrite macro. (progman_sysvinit_enable): New proto. (inittrans): Change return type. * src/progman.c (progman_sysvinit_enable): New function. (progman_running_p): Additional debugging. (prog_start): Special handling for sysvinit components. Remove calls to runlevel_match * src/sysvinit.c (runlevel_match): Remove function. (sysvinit_begin): New function. (inittrans): Return boolean value indicating whether a transition has been made. Call progman_sysvinit_enable to change the status of sysvinit components as appropriate.
Diffstat (limited to 'src/pies.h')
-rw-r--r--src/pies.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/pies.h b/src/pies.h
index a679afd..fc4f59c 100644
--- a/src/pies.h
+++ b/src/pies.h
@@ -180,14 +180,12 @@ enum pies_comp_mode
pies_comp_kbrequest,
/* Restart the component wherever it terminates */
pies_comp_respawn = pies_comp_exec,
};
-#define is_sysvinit(m) ((m)>=pies_mark_sysvinit)
-
#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. */
#define CF_TCPMUX 0x008 /* A plain TCPMUX service */
@@ -250,12 +248,14 @@ struct component
struct redirector redir[2]; /* Repeaters for stdout and stderr */
/* Actions to execute on various exit codes: */
struct action *act_head, *act_tail;
struct action act_temp; /* Auxiliary object used during configuration */
};
+#define is_sysvinit(cp) ((cp)->mode >= pies_mark_sysvinit || (cp)->runlevels)
+
union pies_sockaddr_storage
{
struct sockaddr s;
struct sockaddr_in s_in;
struct sockaddr_un s_un;
};
@@ -298,12 +298,15 @@ struct component *progman_lookup_tcpmux (const char *service,
void progman_run_comp (struct component *comp, int fd,
union pies_sockaddr_storage *sa, socklen_t salen);
void progman_iterate_comp (int (*fun) (struct component *, void *),
void *data);
+void progman_sysvinit_enable (int (*fun) (struct component *, int, void *),
+ void *data);
+
void fd_report (int fd, const char *msg);
int check_acl (pies_acl_t acl, struct sockaddr *s, socklen_t salen);
void log_setup (int want_stderr);
void signal_setup (RETSIGTYPE (*sf)(int));
@@ -447,12 +450,12 @@ struct inetd_builtin
void (*fun) (int, struct component const *);
};
struct inetd_builtin *inetd_builtin_lookup (const char *service, int socktype);
/* sysvinit.c */
-int runlevel_match (struct component *comp);
-void inittrans (void);
+void sysvinit_begin (void);
+int inittrans (void);
int is_comp_wait (struct component *comp);

Return to:

Send suggestions and report system problems to the System administrator.