X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fservice.h;h=0b4f8be8399a36a0036fdf58ee4bcb320af39f7e;hb=1124fe6f01b1d59d016c238026f20380f38d98dc;hp=f01906cad47126fa73e1c3c5760868f72528dfb4;hpb=fdf20a316035779bbec469e11d73c7544acbf30f;p=elogind.git

diff --git a/src/service.h b/src/service.h
index f01906cad..0b4f8be83 100644
--- a/src/service.h
+++ b/src/service.h
@@ -25,7 +25,9 @@
 typedef struct Service Service;
 
 #include "unit.h"
+#include "path.h"
 #include "ratelimit.h"
+#include "service.h"
 
 typedef enum ServiceState {
         SERVICE_DEAD,
@@ -33,7 +35,7 @@ typedef enum ServiceState {
         SERVICE_START,
         SERVICE_START_POST,
         SERVICE_RUNNING,
-        SERVICE_EXITED,            /* Nothing is running anymore, but RemainAfterExit is true, ehnce this is OK */
+        SERVICE_EXITED,            /* Nothing is running anymore, but RemainAfterExit is true hence this is OK */
         SERVICE_RELOAD,
         SERVICE_STOP,              /* No STOP_PRE state, instead just register multiple STOP executables */
         SERVICE_STOP_SIGTERM,
@@ -48,8 +50,10 @@ typedef enum ServiceState {
 } ServiceState;
 
 typedef enum ServiceRestart {
-        SERVICE_ONCE,
+        SERVICE_RESTART_NO,
         SERVICE_RESTART_ON_SUCCESS,
+        SERVICE_RESTART_ON_FAILURE,
+        SERVICE_RESTART_ON_ABORT,
         SERVICE_RESTART_ALWAYS,
         _SERVICE_RESTART_MAX,
         _SERVICE_RESTART_INVALID = -1
@@ -85,7 +89,7 @@ typedef enum NotifyAccess {
 } NotifyAccess;
 
 struct Service {
-        Meta meta;
+        Unit meta;
 
         ServiceType type;
         ServiceRestart restart;
@@ -101,30 +105,49 @@ struct Service {
 
         ServiceState state, deserialized_state;
 
+        /* The exit status of the real main process */
         ExecStatus main_exec_status;
 
+        /* The currently executed control process */
         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;
+
         pid_t main_pid, control_pid;
+        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;
+        bool reload_failure:1;
+
         bool main_pid_known:1;
+        bool main_pid_alien:1;
         bool bus_name_good:1;
         bool forbid_restart:1;
         bool got_socket_fd:1;
+#ifdef HAVE_SYSV_COMPAT
         bool sysv_has_lsb:1;
         bool sysv_enabled:1;
-
-        int socket_fd;
+        int sysv_start_priority_from_rcnd;
         int sysv_start_priority;
 
         char *sysv_path;
         char *sysv_runlevels;
+        usec_t sysv_mtime;
+#endif
 
         char *bus_name;
 
@@ -132,15 +155,18 @@ struct Service {
 
         RateLimit ratelimit;
 
-        struct Socket *socket;
+        UnitRef accept_socket;
 
         Watch timer_watch;
+        PathSpec *pid_file_pathspec;
 
         NotifyAccess notify_access;
 };
 
 extern const UnitVTable service_vtable;
 
+struct Socket;
+
 int service_set_socket_fd(Service *s, int fd, struct Socket *socket);
 
 const char* service_state_to_string(ServiceState i);