summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--examples/source/fdholder/down-signal1
-rw-r--r--examples/source/fdholder/max-death-tally1
-rw-r--r--examples/source/fdholder/timeout-finish1
-rw-r--r--examples/source/fdholder/timeout-kill1
-rw-r--r--src/libs6rc/s6rc_livedir_create.c4
-rw-r--r--src/s6-rc/s6-rc-compile.c102
6 files changed, 68 insertions, 42 deletions
diff --git a/examples/source/fdholder/down-signal b/examples/source/fdholder/down-signal
new file mode 100644
index 0000000..dc1b980
--- /dev/null
+++ b/examples/source/fdholder/down-signal
@@ -0,0 +1 @@
+SIGTERM
diff --git a/examples/source/fdholder/max-death-tally b/examples/source/fdholder/max-death-tally
new file mode 100644
index 0000000..29d6383
--- /dev/null
+++ b/examples/source/fdholder/max-death-tally
@@ -0,0 +1 @@
+100
diff --git a/examples/source/fdholder/timeout-finish b/examples/source/fdholder/timeout-finish
new file mode 100644
index 0000000..e9c02da
--- /dev/null
+++ b/examples/source/fdholder/timeout-finish
@@ -0,0 +1 @@
+5000
diff --git a/examples/source/fdholder/timeout-kill b/examples/source/fdholder/timeout-kill
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/examples/source/fdholder/timeout-kill
@@ -0,0 +1 @@
+0
diff --git a/src/libs6rc/s6rc_livedir_create.c b/src/libs6rc/s6rc_livedir_create.c
index 2ac70de..fd23a07 100644
--- a/src/libs6rc/s6rc_livedir_create.c
+++ b/src/libs6rc/s6rc_livedir_create.c
@@ -1,11 +1,11 @@
/* ISC license. */
-#include <skalibs/nonposix.h> /* Solaris doesn't know mkdtemp() is POSIX */
+#include <skalibs/nonposix.h>
#include <sys/stat.h>
#include <errno.h>
#include <string.h>
#include <unistd.h>
-#include <stdlib.h> /* mkdtemp */
+#include <stdlib.h>
#include <skalibs/stralloc.h>
#include <skalibs/djbunix.h>
#include <s6-rc/s6rc-utils.h>
diff --git a/src/s6-rc/s6-rc-compile.c b/src/s6-rc/s6-rc-compile.c
index ef6a040..bdad01e 100644
--- a/src/s6-rc/s6-rc-compile.c
+++ b/src/s6-rc/s6-rc-compile.c
@@ -164,7 +164,7 @@ static int add_name_nocheck (before_t *be, char const *srcdir, char const *name,
{
info->type = type ;
if (verbosity >= 4)
- strerr_warnt4x("previously encountered identifier ", name, " has now type ", typestr(type)) ;
+ strerr_warnt4x("previously encountered identifier ", name, " now has type ", typestr(type)) ;
switch (type)
{
case SVTYPE_UNDEFINED : break ;
@@ -1188,6 +1188,34 @@ static void write_exe_wrapper (char const *compiled, char const *fn, s6rc_db_t c
auto_rights(compiled, fn, 0755) ;
}
+static int copy_uint (char const *compiled, char const *srcfn, char const *dstfn, unsigned int *u)
+{
+ int r = s6rc_read_uint(srcfn, u) ;
+ if (r < 0)
+ {
+ cleanup(compiled) ;
+ strerr_diefu2sys(111, "read ", srcfn) ;
+ }
+ if (r)
+ {
+ char fmt[UINT_FMT] ;
+ size_t len = uint_fmt(fmt, *u) ;
+ fmt[len++] = '\n' ;
+ if (!openwritenclose_unsafe(dstfn, fmt, len))
+ {
+ cleanup(compiled) ;
+ strerr_diefu2sys(111, "write to ", dstfn) ;
+ }
+ if (chmod(dstfn, 0644) == -1)
+ {
+ cleanup(compiled) ;
+ strerr_diefu2sys(111, "set permissions on ", dstfn) ;
+ }
+ return 1 ;
+ }
+ return 0 ;
+}
+
static inline void write_servicedirs (char const *compiled, s6rc_db_t const *db, char const *const *srcdirs)
{
size_t clen = strlen(compiled) ;
@@ -1197,9 +1225,8 @@ static inline void write_servicedirs (char const *compiled, s6rc_db_t const *db,
{
size_t srcdirlen = strlen(srcdirs[i]) ;
size_t len = strlen(db->string + db->services[i].name) ;
- unsigned int fd = 0 ;
+ unsigned int u ;
int ispipelined = db->services[i].x.longrun.nproducers || db->services[i].x.longrun.consumer < db->nlong ;
- int r ;
char srcfn[srcdirlen + len + 18] ;
char dstfn[clen + len + 30] ;
memcpy(dstfn, compiled, clen) ;
@@ -1210,36 +1237,30 @@ static inline void write_servicedirs (char const *compiled, s6rc_db_t const *db,
cleanup(compiled) ;
strerr_diefu2sys(111, "mkdir ", dstfn) ;
}
+ dstfn[clen + len + 13] = '/' ;
memcpy(srcfn, srcdirs[i], srcdirlen) ;
srcfn[srcdirlen] = '/' ;
memcpy(srcfn + srcdirlen + 1, db->string + db->services[i].name, len) ;
- memcpy(srcfn + srcdirlen + 1 + len, "/notification-fd", 17) ;
- r = s6rc_read_uint(srcfn, &fd) ;
- if (r < 0)
- {
- cleanup(compiled) ;
- strerr_diefu2sys(111, "read ", srcfn) ;
- }
- if (r)
+ srcfn[srcdirlen + len + 1] = '/' ;
+
+ memcpy(srcfn + srcdirlen + len + 2, "finish", 7) ;
+ if (access(srcfn, R_OK) == 0)
{
- char fmt[UINT_FMT] ;
- size_t fmtlen = uint_fmt(fmt, fd) ;
- fmt[fmtlen++] = '\n' ;
- memcpy(dstfn + clen + 13 + len, "/notification-fd", 17) ;
- if (!openwritenclose_unsafe(dstfn, fmt, fmtlen))
+ memcpy(dstfn + clen + 14 + len, "finish", 7) ;
+ if (ispipelined)
{
- cleanup(compiled) ;
- strerr_diefu2sys(111, "write to ", dstfn) ;
+ write_exe_wrapper(compiled, dstfn + clen + 1, db, i, "finish", 1) ;
+ memcpy(dstfn + clen + 20 + len, ".user", 6) ;
}
- if (fd < 3 && verbosity)
+ if (!filecopy_unsafe(srcfn, dstfn, 0755))
{
- fmt[fmtlen-1] = 0 ;
- strerr_warnw4x("longrun ", db->string + db->services[i].name, " has a notification-fd of ", fmt) ;
+ cleanup(compiled) ;
+ strerr_diefu4sys(111, "copy ", srcfn, " to ", dstfn) ;
}
}
- memcpy(srcfn + srcdirlen + 1 + len, "/run", 5) ;
- memcpy(dstfn + clen + 13 + len, "/run", 5) ;
+ memcpy(srcfn + srcdirlen + len + 2, "run", 4) ;
+ memcpy(dstfn + clen + 14 + len, "run", 4) ;
if (ispipelined)
{
write_exe_wrapper(compiled, dstfn + clen + 1, db, i, "run", 0) ;
@@ -1251,32 +1272,33 @@ static inline void write_servicedirs (char const *compiled, s6rc_db_t const *db,
strerr_diefu4sys(111, "copy ", srcfn, " to ", dstfn) ;
}
- memcpy(srcfn + srcdirlen + len + 2, "finish", 7) ;
- if (access(srcfn, R_OK) == 0)
+ memcpy(srcfn + srcdirlen + len + 2, "nosetsid", 9) ;
+ memcpy(dstfn + clen + 14 + len, "nosetsid", 9) ;
+ filecopy_unsafe(srcfn, dstfn, 0644) ;
+
+ memcpy(srcfn + srcdirlen + len + 2, "notification-fd", 16) ;
+ memcpy(dstfn + clen + 14 + len, "notification-fd", 16) ;
+ if (copy_uint(compiled, srcfn, dstfn, &u) && u < 3 && verbosity)
{
- memcpy(dstfn + clen + 14 + len, "finish", 7) ;
- if (ispipelined)
- {
- write_exe_wrapper(compiled, dstfn + clen + 1, db, i, "finish", 1) ;
- memcpy(dstfn + clen + 20 + len, ".user", 6) ;
- }
- if (!filecopy_unsafe(srcfn, dstfn, 0755))
- {
- cleanup(compiled) ;
- strerr_diefu4sys(111, "copy ", srcfn, " to ", dstfn) ;
- }
+ char fmt[UINT_FMT] ;
+ fmt[uint_fmt(fmt, u)] = 0 ;
+ strerr_warnw4x("longrun ", db->string + db->services[i].name, " has a notification-fd of ", fmt) ;
}
memcpy(srcfn + srcdirlen + len + 2, "timeout-kill", 13) ;
memcpy(dstfn + clen + 14 + len, "timeout-kill", 13) ;
- filecopy_unsafe(srcfn, dstfn, 0644) ;
+ copy_uint(compiled, srcfn, dstfn, &u) ;
memcpy(srcfn + srcdirlen + len + 2, "timeout-finish", 15) ;
memcpy(dstfn + clen + 14 + len, "timeout-finish", 15) ;
- filecopy_unsafe(srcfn, dstfn, 0644) ;
+ copy_uint(compiled, srcfn, dstfn, &u) ;
- memcpy(srcfn + srcdirlen + len + 2, "nosetsid", 9) ;
- memcpy(dstfn + clen + 14 + len, "nosetsid", 9) ;
+ memcpy(srcfn + srcdirlen + len + 2, "max-death-tally", 16) ;
+ memcpy(dstfn + clen + 14 + len, "max-death-tally", 16) ;
+ copy_uint(compiled, srcfn, dstfn, &u) ;
+
+ memcpy(srcfn + srcdirlen + len + 2, "down-signal", 12) ;
+ memcpy(dstfn + clen + 14 + len, "down-signal", 12) ;
filecopy_unsafe(srcfn, dstfn, 0644) ;
memcpy(srcfn + srcdirlen + len + 2, "data", 5) ;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 11:49:50 +0000