chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unit: use the UNIT() macro consistently
[elogind.git]
/
src
/
service.h
diff --git
a/src/service.h
b/src/service.h
index 15d58cc8ca984a76c32a209df67868a399f717a9..0b4f8be8399a36a0036fdf58ee4bcb320af39f7e 100644
(file)
--- a/
src/service.h
+++ b/
src/service.h
@@
-25,7
+25,9
@@
typedef struct Service Service;
#include "unit.h"
typedef struct Service Service;
#include "unit.h"
+#include "path.h"
#include "ratelimit.h"
#include "ratelimit.h"
+#include "service.h"
typedef enum ServiceState {
SERVICE_DEAD,
typedef enum ServiceState {
SERVICE_DEAD,
@@
-86,10
+88,8
@@
typedef enum NotifyAccess {
_NOTIFY_ACCESS_INVALID = -1
} NotifyAccess;
_NOTIFY_ACCESS_INVALID = -1
} NotifyAccess;
-typedef struct PathSpec PathSpec;
-
struct Service {
struct Service {
-
Meta
meta;
+
Unit
meta;
ServiceType type;
ServiceRestart restart;
ServiceType type;
ServiceRestart restart;
@@
-155,8
+155,7
@@
struct Service {
RateLimit ratelimit;
RateLimit ratelimit;
- struct Socket *accept_socket;
- Set *configured_sockets;
+ UnitRef accept_socket;
Watch timer_watch;
PathSpec *pid_file_pathspec;
Watch timer_watch;
PathSpec *pid_file_pathspec;
@@
-166,6
+165,8
@@
struct Service {
extern const UnitVTable service_vtable;
extern const UnitVTable service_vtable;
+struct Socket;
+
int service_set_socket_fd(Service *s, int fd, struct Socket *socket);
const char* service_state_to_string(ServiceState i);
int service_set_socket_fd(Service *s, int fd, struct Socket *socket);
const char* service_state_to_string(ServiceState i);