chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journalctl: use _COMM= match for scripts
[elogind.git]
/
src
/
core
/
service.h
diff --git
a/src/core/service.h
b/src/core/service.h
index 819672f61770b9578413c5653de483e1296fd66f..182cba1333673fd0edba91a286dda23949377e46 100644
(file)
--- a/
src/core/service.h
+++ b/
src/core/service.h
@@
-1,7
+1,6
@@
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-#ifndef fooservicehfoo
-#define fooservicehfoo
+#pragma once
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-28,6
+27,8
@@
typedef struct Service Service;
#include "path.h"
#include "ratelimit.h"
#include "service.h"
#include "path.h"
#include "ratelimit.h"
#include "service.h"
+#include "kill.h"
+#include "exit-status.h"
typedef enum ServiceState {
SERVICE_DEAD,
typedef enum ServiceState {
SERVICE_DEAD,
@@
-97,6
+98,7
@@
typedef enum ServiceResult {
SERVICE_FAILURE_SIGNAL,
SERVICE_FAILURE_CORE_DUMP,
SERVICE_FAILURE_WATCHDOG,
SERVICE_FAILURE_SIGNAL,
SERVICE_FAILURE_CORE_DUMP,
SERVICE_FAILURE_WATCHDOG,
+ SERVICE_FAILURE_START_LIMIT,
_SERVICE_RESULT_MAX,
_SERVICE_RESULT_INVALID = -1
} ServiceResult;
_SERVICE_RESULT_MAX,
_SERVICE_RESULT_INVALID = -1
} ServiceResult;
@@
-115,19
+117,25
@@
struct Service {
ServiceType type;
ServiceRestart restart;
ServiceType type;
ServiceRestart restart;
+ ExitStatusSet restart_ignore_status;
+ ExitStatusSet success_status;
/* If set we'll read the main daemon PID from this file */
char *pid_file;
usec_t restart_usec;
/* If set we'll read the main daemon PID from this file */
char *pid_file;
usec_t restart_usec;
- usec_t timeout_usec;
+ usec_t timeout_start_usec;
+ usec_t timeout_stop_usec;
dual_timestamp watchdog_timestamp;
usec_t watchdog_usec;
Watch watchdog_watch;
ExecCommand* exec_command[_SERVICE_EXEC_COMMAND_MAX];
dual_timestamp watchdog_timestamp;
usec_t watchdog_usec;
Watch watchdog_watch;
ExecCommand* exec_command[_SERVICE_EXEC_COMMAND_MAX];
+
ExecContext exec_context;
ExecContext exec_context;
+ KillContext kill_context;
+ CGroupContext cgroup_context;
ServiceState state, deserialized_state;
ServiceState state, deserialized_state;
@@
-164,15
+172,15
@@
struct Service {
bool bus_name_good:1;
bool forbid_restart:1;
bool got_socket_fd:1;
bool bus_name_good:1;
bool forbid_restart:1;
bool got_socket_fd:1;
+ bool start_timeout_defined:1;
#ifdef HAVE_SYSV_COMPAT
#ifdef HAVE_SYSV_COMPAT
+ bool is_sysv:1;
bool sysv_has_lsb:1;
bool sysv_enabled:1;
int sysv_start_priority_from_rcnd;
int sysv_start_priority;
bool sysv_has_lsb:1;
bool sysv_enabled:1;
int sysv_start_priority_from_rcnd;
int sysv_start_priority;
- char *sysv_path;
char *sysv_runlevels;
char *sysv_runlevels;
- usec_t sysv_mtime;
#endif
char *bus_name;
#endif
char *bus_name;
@@
-182,7
+190,6
@@
struct Service {
RateLimit start_limit;
StartLimitAction start_limit_action;
RateLimit start_limit;
StartLimitAction start_limit_action;
-
UnitRef accept_socket;
Watch timer_watch;
UnitRef accept_socket;
Watch timer_watch;
@@
-197,25
+204,23
@@
struct Socket;
int service_set_socket_fd(Service *s, int fd, struct Socket *socket);
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);
+const char* service_state_to_string(ServiceState i)
_const_
;
+ServiceState service_state_from_string(const char *s)
_pure_
;
-const char* service_restart_to_string(ServiceRestart i);
-ServiceRestart service_restart_from_string(const char *s);
+const char* service_restart_to_string(ServiceRestart i)
_const_
;
+ServiceRestart service_restart_from_string(const char *s)
_pure_
;
-const char* service_type_to_string(ServiceType i);
-ServiceType service_type_from_string(const char *s);
+const char* service_type_to_string(ServiceType i)
_const_
;
+ServiceType service_type_from_string(const char *s)
_pure_
;
-const char* service_exec_command_to_string(ServiceExecCommand i);
-ServiceExecCommand service_exec_command_from_string(const char *s);
+const char* service_exec_command_to_string(ServiceExecCommand i)
_const_
;
+ServiceExecCommand service_exec_command_from_string(const char *s)
_pure_
;
-const char* notify_access_to_string(NotifyAccess i);
-NotifyAccess notify_access_from_string(const char *s);
+const char* notify_access_to_string(NotifyAccess i)
_const_
;
+NotifyAccess notify_access_from_string(const char *s)
_pure_
;
-const char* service_result_to_string(ServiceResult i);
-ServiceResult service_result_from_string(const char *s);
+const char* service_result_to_string(ServiceResult i)
_const_
;
+ServiceResult service_result_from_string(const char *s)
_pure_
;
-const char* start_limit_action_to_string(StartLimitAction i);
-StartLimitAction start_limit_action_from_string(const char *s);
-
-#endif
+const char* start_limit_action_to_string(StartLimitAction i) _const_;
+StartLimitAction start_limit_action_from_string(const char *s) _pure_;