X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=service.h;h=f357fc857e4f3e55fe6d82beda3c7ed9d30397b1;hp=1a170f526feed3b5eb0359c1b066808abe98d414;hb=8c43883a682b2edd902b170ab2e0f3d50d7e92e0;hpb=8309400a17b041fb8b52b13b9125eb65d11f3669

diff --git a/service.h b/service.h
index 1a170f526..f357fc857 100644
--- a/service.h
+++ b/service.h
@@ -33,6 +33,7 @@ typedef enum ServiceState {
         SERVICE_START,
         SERVICE_START_POST,
         SERVICE_RUNNING,
+        SERVICE_EXITED,            /* Nothing is running anymore, but ValidNoProcess is true, ehnce this is OK */
         SERVICE_RELOAD,
         SERVICE_STOP,              /* No STOP_PRE state, instead just register multiple STOP executables */
         SERVICE_STOP_SIGTERM,
@@ -69,8 +70,8 @@ typedef enum ServiceExecCommand {
         SERVICE_EXEC_RELOAD,
         SERVICE_EXEC_STOP,
         SERVICE_EXEC_STOP_POST,
-        _SERVICE_EXEC_MAX,
-        _SERVICE_EXEC_INVALID = -1
+        _SERVICE_EXEC_COMMAND_MAX,
+        _SERVICE_EXEC_COMMAND_INVALID = -1
 } ServiceExecCommand;
 
 struct Service {
@@ -85,7 +86,7 @@ struct Service {
         usec_t restart_usec;
         usec_t timeout_usec;
 
-        ExecCommand* exec_command[_SERVICE_EXEC_MAX];
+        ExecCommand* exec_command[_SERVICE_EXEC_COMMAND_MAX];
         ExecContext exec_context;
 
         bool permissions_start_only;
@@ -94,22 +95,24 @@ struct Service {
 
         ServiceState state;
 
+        KillMode kill_mode;
+
         ExecStatus main_exec_status;
 
         ExecCommand *control_command;
         pid_t main_pid, control_pid;
         bool main_pid_known:1;
 
-        bool sysv_has_lsb:1;
-
         bool failure:1; /* if we shut down, remember why */
-        Watch timer_watch;
 
+        bool sysv_has_lsb:1;
         char *sysv_path;
         int sysv_start_priority;
         char *sysv_runlevels;
 
         RateLimit ratelimit;
+
+        Watch timer_watch;
 };
 
 extern const UnitVTable service_vtable;