X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=service.h;h=40bd57e256a4a4ef0295a5c610fb276d4725a9a3;hp=e22fed5bf69f625fffd335b34a1809686d4d96a3;hb=30de7d8520d1dfaa8c46098f972f57961fc91923;hpb=94f043472a5af62dc9cd5767e89ba33872212d5e

diff --git a/service.h b/service.h
index e22fed5bf..40bd57e25 100644
--- a/service.h
+++ b/service.h
@@ -3,6 +3,25 @@
 #ifndef fooservicehfoo
 #define fooservicehfoo
 
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
 typedef struct Service Service;
 
 #include "unit.h"
@@ -14,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,
@@ -37,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;
@@ -50,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 {
@@ -66,24 +87,50 @@ 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;
 
-        ServiceState state;
+        bool permissions_start_only;
+        bool root_directory_start_only;
+        bool valid_no_process;
+
+        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;
 };
 
-const UnitVTable service_vtable;
+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);