X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fservice.h;h=0ddaaa4c2def37d33f99983ac4808b0613f580f5;hp=d644e7207ab41fa1e26f83f9bcb73e76e16caa71;hb=385771fcf0e9bda850c5cee765ab70431dbed2fc;hpb=8c47c7325fa1ab72febf807f8831ff24c75fbf45 diff --git a/src/service.h b/src/service.h index d644e7207..0ddaaa4c2 100644 --- a/src/service.h +++ b/src/service.h @@ -41,7 +41,7 @@ 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_MAINTAINANCE, + SERVICE_MAINTENANCE, SERVICE_AUTO_RESTART, _SERVICE_STATE_MAX, _SERVICE_STATE_INVALID = -1 @@ -76,6 +76,14 @@ typedef enum ServiceExecCommand { _SERVICE_EXEC_COMMAND_INVALID = -1 } ServiceExecCommand; +typedef enum NotifyAccess { + NOTIFY_NONE, + NOTIFY_ALL, + NOTIFY_MAIN, + _NOTIFY_ACCESS_MAX, + _NOTIFY_ACCESS_INVALID = -1 +} NotifyAccess; + struct Service { Meta meta; @@ -91,19 +99,18 @@ 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 permissions_start_only; + bool root_directory_start_only; + bool valid_no_process; + bool main_pid_known:1; /* If we shut down, remember why */ @@ -116,8 +123,11 @@ struct Service { bool got_socket_fd:1; bool sysv_has_lsb:1; - char *sysv_path; + + int socket_fd; int sysv_start_priority; + + char *sysv_path; char *sysv_runlevels; char *bus_name; @@ -126,14 +136,16 @@ struct Service { RateLimit ratelimit; - int socket_fd; + struct Socket *socket; 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); @@ -147,4 +159,7 @@ 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); +const char* notify_access_to_string(NotifyAccess i); +NotifyAccess notify_access_from_string(const char *s); + #endif