X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Fservice.h;h=02726efe254db076bd29445f6bd64911ccbc5868;hb=bb242b7b5277f5db4a01be905f26eccd382ff1e0;hp=758604621e74072bf36dfedb66dfd189a8100eb1;hpb=e2f3b44cfc8864bfea7c77ff4c383ce9b535f27e;p=elogind.git

diff --git a/src/service.h b/src/service.h
index 758604621..02726efe2 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,
@@ -86,8 +88,20 @@ typedef enum NotifyAccess {
         _NOTIFY_ACCESS_INVALID = -1
 } NotifyAccess;
 
+typedef enum ServiceResult {
+        SERVICE_SUCCESS,
+        SERVICE_FAILURE_RESOURCES,
+        SERVICE_FAILURE_TIMEOUT,
+        SERVICE_FAILURE_EXIT_CODE,
+        SERVICE_FAILURE_SIGNAL,
+        SERVICE_FAILURE_CORE_DUMP,
+        SERVICE_FAILURE_WATCHDOG,
+        _SERVICE_RESULT_MAX,
+        _SERVICE_RESULT_INVALID = -1
+} ServiceResult;
+
 struct Service {
-        Meta meta;
+        Unit meta;
 
         ServiceType type;
         ServiceRestart restart;
@@ -98,15 +112,29 @@ struct Service {
         usec_t restart_usec;
         usec_t timeout_usec;
 
+        dual_timestamp watchdog_timestamp;
+        usec_t watchdog_usec;
+        Watch watchdog_watch;
+
         ExecCommand* exec_command[_SERVICE_EXEC_COMMAND_MAX];
         ExecContext exec_context;
 
         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,22 +143,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;
+        ServiceResult result;
+        ServiceResult reload_result;
 
         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;
@@ -139,16 +171,18 @@ struct Service {
 
         RateLimit ratelimit;
 
-        struct Socket *accept_socket;
-        Set *configured_sockets;
+        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);
@@ -166,4 +200,7 @@ 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);
 
+const char* service_result_to_string(ServiceResult i);
+ServiceResult service_result_from_string(const char *s);
+
 #endif