downgrade a few log msgs

[elogind.git] / service.h

diff --git a/service.h b/service.h
index 5ffdde19cb4c014975e8e9f42437af1ec6adc247..40bd57e256a4a4ef0295a5c610fb276d4725a9a3 100644 (file)
--- 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,
@@ -56,8 +57,9 @@ typedef enum 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_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_DBUS,     /* we fork and wait until a specific D-Bus name appears on the bus */
         _SERVICE_TYPE_MAX,
         _SERVICE_TYPE_INVALID = -1
 } ServiceType;
@@ -69,8 +71,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,32 +87,51 @@ 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;
         bool root_directory_start_only;
         bool valid_no_process;
 
-        ServiceState state;
+        ServiceState state, deserialized_state;
+
+        KillMode kill_mode;
 
         ExecStatus main_exec_status;
 
         ExecCommand *control_command;
+        ServiceExecCommand control_command_id;
         pid_t main_pid, control_pid;
         bool main_pid_known:1;
 
-        bool failure:1; /* if we shut down, remember why */
-        Watch timer_watch;
+        /* If we shut down, remember why */
+        bool failure:1;
+
+        bool bus_name_good:1;
+
+        bool allow_restart:1;
+
+        bool got_socket_fd:1;
 
+        bool sysv_has_lsb:1;
         char *sysv_path;
         int sysv_start_priority;
+        char *sysv_runlevels;
+
+        char *bus_name;
 
         RateLimit ratelimit;
+
+        int socket_fd;
+
+        Watch timer_watch;
 };
 
 extern const UnitVTable service_vtable;
 
+int service_set_socket_fd(Service *s, int fd);
+
 const char* service_state_to_string(ServiceState i);
 ServiceState service_state_from_string(const char *s);