chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
man: nspawn fixes
[elogind.git]
/
src
/
service.h
diff --git
a/src/service.h
b/src/service.h
index 5242de58fa854b07a7cd3125bfdc7f61070f07ef..e28f74b8988c221a9c5eb690424ad635dd2fc2e3 100644
(file)
--- a/
src/service.h
+++ b/
src/service.h
@@
-1,4
+1,4
@@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8
; indent-tabs-mode: nil
-*-*/
#ifndef fooservicehfoo
#define fooservicehfoo
#ifndef fooservicehfoo
#define fooservicehfoo
@@
-33,7
+33,7
@@
typedef enum ServiceState {
SERVICE_START,
SERVICE_START_POST,
SERVICE_RUNNING,
SERVICE_START,
SERVICE_START_POST,
SERVICE_RUNNING,
- SERVICE_EXITED, /* Nothing is running anymore, but
ValidNoProcess is true, eh
nce this is OK */
+ SERVICE_EXITED, /* Nothing is running anymore, but
RemainAfterExit is true he
nce this is OK */
SERVICE_RELOAD,
SERVICE_STOP, /* No STOP_PRE state, instead just register multiple STOP executables */
SERVICE_STOP_SIGTERM,
SERVICE_RELOAD,
SERVICE_STOP, /* No STOP_PRE state, instead just register multiple STOP executables */
SERVICE_STOP_SIGTERM,
@@
-41,15
+41,17
@@
typedef enum ServiceState {
SERVICE_STOP_POST,
SERVICE_FINAL_SIGTERM, /* In case the STOP_POST executable hangs, we shoot that down, too */
SERVICE_FINAL_SIGKILL,
SERVICE_STOP_POST,
SERVICE_FINAL_SIGTERM, /* In case the STOP_POST executable hangs, we shoot that down, too */
SERVICE_FINAL_SIGKILL,
- SERVICE_
MAINTAINANCE
,
+ SERVICE_
FAILED
,
SERVICE_AUTO_RESTART,
_SERVICE_STATE_MAX,
_SERVICE_STATE_INVALID = -1
} ServiceState;
typedef enum ServiceRestart {
SERVICE_AUTO_RESTART,
_SERVICE_STATE_MAX,
_SERVICE_STATE_INVALID = -1
} ServiceState;
typedef enum ServiceRestart {
- SERVICE_
ONCE
,
+ SERVICE_
RESTART_NO
,
SERVICE_RESTART_ON_SUCCESS,
SERVICE_RESTART_ON_SUCCESS,
+ SERVICE_RESTART_ON_FAILURE,
+ SERVICE_RESTART_ON_ABORT,
SERVICE_RESTART_ALWAYS,
_SERVICE_RESTART_MAX,
_SERVICE_RESTART_INVALID = -1
SERVICE_RESTART_ALWAYS,
_SERVICE_RESTART_MAX,
_SERVICE_RESTART_INVALID = -1
@@
-58,8
+60,9
@@
typedef enum ServiceRestart {
typedef enum ServiceType {
SERVICE_SIMPLE, /* we fork and go on right-away (i.e. modern socket activated daemons) */
SERVICE_FORKING, /* forks by itself (i.e. traditional daemons) */
typedef enum ServiceType {
SERVICE_SIMPLE, /* we fork and go on right-away (i.e. modern socket activated daemons) */
SERVICE_FORKING, /* forks by itself (i.e. traditional daemons) */
- SERVICE_
FINISH,
/* we fork and wait until the program finishes (i.e. programs like fsck which run and need to finish before we continue) */
+ SERVICE_
ONESHOT,
/* we fork and wait until the program finishes (i.e. programs like fsck which run and need to finish before we continue) */
SERVICE_DBUS, /* we fork and wait until a specific D-Bus name appears on the bus */
SERVICE_DBUS, /* we fork and wait until a specific D-Bus name appears on the bus */
+ SERVICE_NOTIFY, /* we fork and wait until a daemon sends us a ready message with sd_notify() */
_SERVICE_TYPE_MAX,
_SERVICE_TYPE_INVALID = -1
} ServiceType;
_SERVICE_TYPE_MAX,
_SERVICE_TYPE_INVALID = -1
} ServiceType;
@@
-75,6
+78,14
@@
typedef enum ServiceExecCommand {
_SERVICE_EXEC_COMMAND_INVALID = -1
} ServiceExecCommand;
_SERVICE_EXEC_COMMAND_INVALID = -1
} ServiceExecCommand;
+typedef enum NotifyAccess {
+ NOTIFY_NONE,
+ NOTIFY_ALL,
+ NOTIFY_MAIN,
+ _NOTIFY_ACCESS_MAX,
+ _NOTIFY_ACCESS_INVALID = -1
+} NotifyAccess;
+
struct Service {
Meta meta;
struct Service {
Meta meta;
@@
-90,47
+101,69
@@
struct Service {
ExecCommand* exec_command[_SERVICE_EXEC_COMMAND_MAX];
ExecContext exec_context;
ExecCommand* exec_command[_SERVICE_EXEC_COMMAND_MAX];
ExecContext exec_context;
- bool permissions_start_only;
- bool root_directory_start_only;
- bool valid_no_process;
-
ServiceState state, deserialized_state;
ServiceState state, deserialized_state;
- KillMode kill_mode;
-
+ /* The exit status of the real main process */
ExecStatus main_exec_status;
ExecStatus main_exec_status;
+ /* The currently executed control process */
ExecCommand *control_command;
ExecCommand *control_command;
+
+ /* The currently executed main process, which may be NULL if
+ * the main process got started via forking mode and not by
+ * us */
+ ExecCommand *main_command;
+
+ /* The ID of the control command currently being executed */
ServiceExecCommand control_command_id;
ServiceExecCommand control_command_id;
+
pid_t main_pid, control_pid;
pid_t main_pid, control_pid;
- bool main_pid_known:1;
+ int socket_fd;
+
+ int fsck_passno;
+
+ bool permissions_start_only;
+ bool root_directory_start_only;
+ bool remain_after_exit;
+ bool guess_main_pid;
/* If we shut down, remember why */
bool failure:1;
/* If we shut down, remember why */
bool failure:1;
+ bool reload_failure:1;
+ bool main_pid_known:1;
+ bool main_pid_alien:1;
bool bus_name_good:1;
bool bus_name_good:1;
-
- bool allow_restart:1;
-
+ bool forbid_restart:1;
bool got_socket_fd:1;
bool got_socket_fd:1;
-
+#ifdef HAVE_SYSV_COMPAT
bool sysv_has_lsb:1;
bool sysv_has_lsb:1;
- char *sysv_path;
+ bool sysv_enabled:1;
+ int sysv_start_priority_from_rcnd;
int sysv_start_priority;
int sysv_start_priority;
+
+ char *sysv_path;
char *sysv_runlevels;
char *sysv_runlevels;
+ usec_t sysv_mtime;
+#endif
char *bus_name;
char *bus_name;
+ char *status_text;
+
RateLimit ratelimit;
RateLimit ratelimit;
- int socket_fd;
+ struct Socket *accept_socket;
+ Set *configured_sockets;
Watch timer_watch;
Watch timer_watch;
+
+ NotifyAccess notify_access;
};
extern const UnitVTable service_vtable;
};
extern const UnitVTable service_vtable;
-int service_set_socket_fd(Service *s, int fd);
+int service_set_socket_fd(Service *s, int fd
, struct Socket *socket
);
const char* service_state_to_string(ServiceState i);
ServiceState service_state_from_string(const char *s);
const char* service_state_to_string(ServiceState i);
ServiceState service_state_from_string(const char *s);
@@
-144,4
+177,7
@@
ServiceType service_type_from_string(const char *s);
const char* service_exec_command_to_string(ServiceExecCommand i);
ServiceExecCommand service_exec_command_from_string(const char *s);
const char* service_exec_command_to_string(ServiceExecCommand i);
ServiceExecCommand service_exec_command_from_string(const char *s);
+const char* notify_access_to_string(NotifyAccess i);
+NotifyAccess notify_access_from_string(const char *s);
+
#endif
#endif