X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fservice.h;h=2102826723686f63461d379504f15fde6b257a6b;hp=1b59dad9320586372d91fcdc46608e8fb726c8ce;hb=706343f492725fe430879c5d4a3485d7c49b0601;hpb=ba035df230e41bf9d70ebb47915c9472b7884412

diff --git a/src/service.h b/src/service.h
index 1b59dad93..210282672 100644
--- a/src/service.h
+++ b/src/service.h
@@ -25,6 +25,7 @@
 typedef struct Service Service;
 
 #include "unit.h"
+#include "path.h"
 #include "ratelimit.h"
 
 typedef enum ServiceState {
@@ -103,10 +104,20 @@ 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;
 
@@ -115,20 +126,26 @@ struct Service {
         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 sysv_start_priority_from_rcnd;
         int sysv_start_priority;
 
         char *sysv_path;
         char *sysv_runlevels;
+        usec_t sysv_mtime;
 #endif
 
         char *bus_name;
@@ -141,6 +158,7 @@ struct Service {
         Set *configured_sockets;
 
         Watch timer_watch;
+        PathSpec *pid_file_pathspec;
 
         NotifyAccess notify_access;
 };