X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=service.h;h=e22fed5bf69f625fffd335b34a1809686d4d96a3;hp=d7f2c708dd65926148ba7ba3558ef73dee81a840;hb=94f043472a5af62dc9cd5767e89ba33872212d5e;hpb=5cb5a6ffc33667c93e9bc3572534dcaa684046e3

diff --git a/service.h b/service.h
index d7f2c708d..e22fed5bf 100644
--- a/service.h
+++ b/service.h
@@ -5,9 +5,8 @@
 
 typedef struct Service Service;
 
-#include "name.h"
-#include "socket.h"
-#include "timer.h"
+#include "unit.h"
+#include "ratelimit.h"
 
 typedef enum ServiceState {
         SERVICE_DEAD,
@@ -15,51 +14,87 @@ typedef enum ServiceState {
         SERVICE_START,
         SERVICE_START_POST,
         SERVICE_RUNNING,
-        SERVICE_RELOAD_PRE,
         SERVICE_RELOAD,
-        SERVICE_RELOAD_POST,
-        SERVICE_STOP_PRE,
-        SERVICE_STOP,
-        SERVICE_SIGTERM,
-        SERVICE_SIGKILL,
+        SERVICE_STOP,              /* No STOP_PRE state, instead just register multiple STOP executables */
+        SERVICE_STOP_SIGTERM,
+        SERVICE_STOP_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_AUTO_RESTART,
         _SERVICE_STATE_MAX,
+        _SERVICE_STATE_INVALID = -1
 } ServiceState;
 
-typedef enum ServiceMode {
+typedef enum ServiceRestart {
         SERVICE_ONCE,
-        SERVICE_RESTART
-} ServiceMode;
+        SERVICE_RESTART_ON_SUCCESS,
+        SERVICE_RESTART_ALWAYS,
+        _SERVICE_RESTART_MAX,
+        _SERVICE_RESTART_INVALID = -1
+} ServiceRestart;
+
+typedef enum ServiceType {
+        SERVICE_FORKING,  /* forks by itself (i.e. traditional daemons) */
+        SERVICE_SIMPLE,   /* we fork and go on right-away (i.e. modern socket activated 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_TYPE_MAX,
+        _SERVICE_TYPE_INVALID = -1
+} ServiceType;
 
 typedef enum ServiceExecCommand {
         SERVICE_EXEC_START_PRE,
         SERVICE_EXEC_START,
         SERVICE_EXEC_START_POST,
-        SERVICE_EXEC_RELOAD_PRE,
         SERVICE_EXEC_RELOAD,
-        SERVICE_EXEC_RELOAD_POST,
-        SERVICE_EXEC_STOP_PRE,
         SERVICE_EXEC_STOP,
         SERVICE_EXEC_STOP_POST,
-        _SERVICE_EXEC_MAX
+        _SERVICE_EXEC_MAX,
+        _SERVICE_EXEC_INVALID = -1
 } ServiceExecCommand;
 
 struct Service {
         Meta meta;
 
-        ServiceState state;
-        ServiceMode mode;
+        ServiceType type;
+        ServiceRestart restart;
+
+        /* If set we'll read the main daemon PID from this file */
+        char *pid_file;
+
+        usec_t restart_usec;
+        usec_t timeout_usec;
 
         ExecCommand* exec_command[_SERVICE_EXEC_MAX];
         ExecContext exec_context;
 
-        pid_t service_pid, control_pid;
+        ServiceState state;
+
+        ExecStatus main_exec_status;
 
-        Socket *socket;
-        Timer *timer;
+        ExecCommand *control_command;
+        pid_t main_pid, control_pid;
+        bool main_pid_known:1;
+
+        bool failure:1; /* if we shut down, remember why */
+        Watch timer_watch;
+
+        RateLimit ratelimit;
 };
 
-const NameVTable service_vtable;
+const UnitVTable service_vtable;
+
+const char* service_state_to_string(ServiceState i);
+ServiceState service_state_from_string(const char *s);
+
+const char* service_restart_to_string(ServiceRestart i);
+ServiceRestart service_restart_from_string(const char *s);
+
+const char* service_type_to_string(ServiceType i);
+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);
 
 #endif