From 62133a68b7a1aecf65765f7137ef8d6e0eed913e Mon Sep 17 00:00:00 2001
From: David Oberhollenzer <goliath@infraroot.at>
Date: Fri, 8 May 2020 01:50:49 +0200
Subject: Cleanup: complete redesign of the initd supervisor
- Cleanly seperate service description parsed from file
from the actual run-time data.
- Remove the use of the signalfd and make asyncronous calls
into the supervisor from signal context work.
Signed-off-by: David Oberhollenzer <goliath@infraroot.at>
---
lib/include/service.h | 6 ------
lib/init/rdsvc.c | 1 -
2 files changed, 7 deletions(-)
(limited to 'lib')
diff --git a/lib/include/service.h b/lib/include/service.h
index a01c6bb..0fbf018 100644
--- a/lib/include/service.h
+++ b/lib/include/service.h
@@ -40,7 +40,6 @@ enum {
SVC_FLAG_TRUNCATE_OUT = 0x01,
SVC_FLAG_HAS_EXEC = 0x10,
- SVC_FLAG_ADMIN_STOPPED = 0x20,
};
typedef struct service_t {
@@ -53,7 +52,6 @@ typedef struct service_t {
char *desc; /* description string */
char *ctty; /* controlling tty or log file */
int rspwn_limit; /* maximum respawn count */
- int rspwn_count; /* services respawn counter */
unsigned int flags; /* SVC_FLAG_* bit field */
/* linked list of command lines to execute */
@@ -65,10 +63,6 @@ typedef struct service_t {
int num_before;
int num_after;
- pid_t pid;
- int status; /* process exit status */
- int id; /* service ID used by initd */
-
char name[]; /* canonical service name */
} service_t;
diff --git a/lib/init/rdsvc.c b/lib/init/rdsvc.c
index 7f7bc29..09ed156 100644
--- a/lib/init/rdsvc.c
+++ b/lib/init/rdsvc.c
@@ -243,7 +243,6 @@ service_t *rdsvc(int dirfd, const char *filename)
goto fail_oom;
memcpy(svc->name, filename, nlen);
- svc->id = -1;
if (rdcfg(svc, &rd, svc_params,
sizeof(svc_params) / sizeof(svc_params[0]))) {
--
cgit v1.2.3