X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fservice.h;h=500bebff0886a3894f38562823c6ee1238ed863b;hp=7b85771a30fb9911672ad2e172e32942e31ddad6;hb=180f90cb13ffbf8e6269ec3afb24243fec936e0c;hpb=c952c6ece28b6c0f774f823c917f458fe3424993 diff --git a/src/service.h b/src/service.h index 7b85771a3..500bebff0 100644 --- a/src/service.h +++ b/src/service.h @@ -1,4 +1,4 @@ -/*-*- Mode: C; c-basic-offset: 8 -*-*/ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ #ifndef fooservicehfoo #define fooservicehfoo @@ -33,7 +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_EXITED, /* Nothing is running anymore, but RemainAfterExit is true, ehnce this is OK */ SERVICE_RELOAD, SERVICE_STOP, /* No STOP_PRE state, instead just register multiple STOP executables */ SERVICE_STOP_SIGTERM, @@ -41,15 +41,17 @@ typedef enum ServiceState { SERVICE_STOP_POST, SERVICE_FINAL_SIGTERM, /* In case the STOP_POST executable hangs, we shoot that down, too */ SERVICE_FINAL_SIGKILL, - SERVICE_MAINTENANCE, + SERVICE_FAILED, SERVICE_AUTO_RESTART, _SERVICE_STATE_MAX, _SERVICE_STATE_INVALID = -1 } ServiceState; typedef enum ServiceRestart { - SERVICE_ONCE, + SERVICE_RESTART_NO, SERVICE_RESTART_ON_SUCCESS, + SERVICE_RESTART_ON_FAILURE, + SERVICE_RESTART_ON_ABORT, SERVICE_RESTART_ALWAYS, _SERVICE_RESTART_MAX, _SERVICE_RESTART_INVALID = -1 @@ -58,7 +60,7 @@ typedef enum ServiceRestart { typedef enum ServiceType { SERVICE_SIMPLE, /* we fork and go on right-away (i.e. modern socket activated daemons) */ SERVICE_FORKING, /* forks by itself (i.e. traditional 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_ONESHOT, /* 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_NOTIFY, /* we fork and wait until a daemon sends us a ready message with sd_notify() */ _SERVICE_TYPE_MAX, @@ -90,8 +92,6 @@ struct Service { ServiceType type; ServiceRestart restart; - NotifyAccess notify_access; - /* If set we'll read the main daemon PID from this file */ char *pid_file; @@ -101,34 +101,35 @@ struct Service { 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, 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; + int socket_fd; + + int fsck_passno; + + bool permissions_start_only; + bool root_directory_start_only; + bool remain_after_exit; /* If we shut down, remember why */ bool failure:1; - + bool main_pid_known:1; bool bus_name_good:1; - - bool allow_restart:1; - + bool forbid_restart:1; bool got_socket_fd:1; - +#ifdef HAVE_SYSV_COMPAT bool sysv_has_lsb:1; - char *sysv_path; + bool sysv_enabled:1; int sysv_start_priority; + + char *sysv_path; char *sysv_runlevels; +#endif char *bus_name; @@ -136,14 +137,17 @@ struct Service { RateLimit ratelimit; - int socket_fd; + struct Socket *accept_socket; + Set *configured_sockets; Watch timer_watch; + + NotifyAccess notify_access; }; extern const UnitVTable service_vtable; -int service_set_socket_fd(Service *s, int fd); +int service_set_socket_fd(Service *s, int fd, struct Socket *socket); const char* service_state_to_string(ServiceState i); ServiceState service_state_from_string(const char *s);