9 files changed, 144 insertions, 2 deletions

diff --git a/src/include/s6/s6-supervise.h b/src/include/s6/s6-supervise.h
index bbd8539..187bc20 100644
--- a/src/include/s6/s6-supervise.h
+++ b/src/include/s6/s6-supervise.h
@@ -11,6 +11,8 @@
 #define S6_SVSCAN_CTLDIR ".s6-svscan"
 #define S6_SVSTATUS_FILENAME S6_SUPERVISE_CTLDIR "/status"
 #define S6_SVSTATUS_SIZE 35
+#define S6_DTALLY_FILENAME S6_SUPERVISE_CTLDIR "/death_tally"
+#define S6_MAX_DEATH_TALLY 4096
 
 extern int s6_svc_ok (char const *) ;
 extern int s6_svc_write (char const *, char const *, size_t) ;
@@ -32,6 +34,7 @@ struct s6_svstatus_s
   unsigned int flagwant : 1 ; /* unused */
   unsigned int flagwantup : 1 ;
   unsigned int flagready : 1 ;
+  unsigned int flagthrottled : 1 ;
 } ;
 
 #define S6_SVSTATUS_ZERO \
@@ -44,7 +47,8 @@ struct s6_svstatus_s
   .flagfinishing = 0, \
   .flagwant = 1, \
   .flagwantup = 1, \
-  .flagready = 1 \
+  .flagready = 1, \
+  .flagthrottled = 0 \
 }
 
 extern void s6_svstatus_pack (char *, s6_svstatus_t const *) ;
@@ -56,4 +60,20 @@ extern int s6_svstatus_write (char const *, s6_svstatus_t const *) ;
 extern int s6_supervise_lock (char const *) ;
 extern int s6_supervise_lock_mode (char const *, unsigned int, unsigned int) ;
 
+typedef struct s6_dtally_s s6_dtally_t, *s6_dtally_ref ;
+struct s6_dtally_s
+{
+  tain_t stamp ;
+  unsigned char exitcode ;
+  unsigned char sig ;
+} ;
+#define S6_DTALLY_ZERO { .stamp = TAIN_ZERO, .exitcode = 0, .sig = 0 }
+
+#define S6_DTALLY_PACK (TAIN_PACK + 2)
+
+extern void s6_dtally_pack (char *, s6_dtally_t const *) ;
+extern void s6_dtally_unpack (char const *, s6_dtally_t *) ;
+extern ssize_t s6_dtally_read (char const *, s6_dtally_t *, size_t) ;
+extern int s6_dtally_write (char const *, s6_dtally_t const *, size_t) ;
+
 #endif
diff --git a/src/libs6/deps-lib/s6 b/src/libs6/deps-lib/s6
index 47a3335..65612cc 100644
--- a/src/libs6/deps-lib/s6
+++ b/src/libs6/deps-lib/s6
@@ -28,6 +28,10 @@ s6_accessrules_uidgid_cdb.o
 s6_accessrules_uidgid_fs.o
 s6_supervise_lock.o
 s6_supervise_lock_mode.o
+s6_dtally_pack.o
+s6_dtally_unpack.o
+s6_dtally_read.o
+s6_dtally_write.o
 s6_svc_lock_take.o
 s6_svc_lock_release.o
 s6_svc_ok.o
diff --git a/src/libs6/s6_dtally_pack.c b/src/libs6/s6_dtally_pack.c
new file mode 100644
index 0000000..1608e78
--- /dev/null
+++ b/src/libs6/s6_dtally_pack.c
@@ -0,0 +1,11 @@
+/* ISC license. */
+
+#include <skalibs/tai.h>
+#include <s6/s6-supervise.h>
+
+void s6_dtally_pack (char *pack, s6_dtally_t const *d)
+{
+  tain_pack(pack, &d->stamp) ;
+  pack[TAIN_PACK] = d->exitcode ;
+  pack[TAIN_PACK + 1] = d->sig ;
+}
diff --git a/src/libs6/s6_dtally_read.c b/src/libs6/s6_dtally_read.c
new file mode 100644
index 0000000..3906b93
--- /dev/null
+++ b/src/libs6/s6_dtally_read.c
@@ -0,0 +1,51 @@
+/* ISC license. */
+
+#include <sys/stat.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+#include <skalibs/allreadwrite.h>
+#include <skalibs/tai.h>
+#include <skalibs/djbunix.h>
+#include <s6/s6-supervise.h>
+
+static int truncit (char const *s)
+{
+  int fd = open_trunc(s) ;
+  if (fd < 0) return -1 ;
+  fd_close(fd) ;
+  return 0 ;
+}
+
+ssize_t s6_dtally_read (char const *sv, s6_dtally_t *tab, size_t max)
+{
+  size_t len = strlen(sv) ;
+  size_t n ;
+  int fd ;
+  struct stat st ;
+  char fn[len + sizeof(S6_DTALLY_FILENAME) + 1] ;
+  memcpy(fn, sv, len) ;
+  memcpy(fn + len, "/" S6_DTALLY_FILENAME, sizeof(S6_DTALLY_FILENAME) + 1) ;
+  fd = open_read(fn) ;
+  if (fd < 0) return errno == ENOENT ? truncit(fn) : -1 ;
+  if (fstat(fd, &st) < 0) goto err ;
+  if (st.st_size % S6_DTALLY_PACK)
+  {
+    fd_close(fd) ;
+    return truncit(fn) ;
+  }
+  n = st.st_size / S6_DTALLY_PACK ;
+  if (n > max) n = max ;
+  {
+    char tmp[n ? S6_DTALLY_PACK * n : 1] ;
+    if (lseek(fd, -(off_t)(n * S6_DTALLY_PACK), SEEK_END) < 0) goto err ;
+    if (allread(fd, tmp, n * S6_DTALLY_PACK) < n * S6_DTALLY_PACK) goto err ;
+    fd_close(fd) ;
+    for (size_t i = 0 ; i < n ; i++) s6_dtally_unpack(tmp + i * S6_DTALLY_PACK, tab + i) ;
+  }
+  return n ;
+
+ err:
+  fd_close(fd) ;
+  return -1 ;
+}
diff --git a/src/libs6/s6_dtally_unpack.c b/src/libs6/s6_dtally_unpack.c
new file mode 100644
index 0000000..8fca787
--- /dev/null
+++ b/src/libs6/s6_dtally_unpack.c
@@ -0,0 +1,11 @@
+/* ISC license. */
+
+#include <skalibs/tai.h>
+#include <s6/s6-supervise.h>
+
+void s6_dtally_unpack (char const *pack, s6_dtally_t *d)
+{
+  tain_unpack(pack, &d->stamp) ;
+  d->exitcode = pack[TAIN_PACK] ;
+  d->sig = pack[TAIN_PACK + 1] ;
+}
diff --git a/src/libs6/s6_dtally_write.c b/src/libs6/s6_dtally_write.c
new file mode 100644
index 0000000..785376a
--- /dev/null
+++ b/src/libs6/s6_dtally_write.c
@@ -0,0 +1,16 @@
+/* ISC license. */
+
+#include <string.h>
+#include <skalibs/djbunix.h>
+#include <s6/s6-supervise.h>
+
+int s6_dtally_write (char const *sv, s6_dtally_t const *tab, size_t n)
+{
+  size_t len = strlen(sv) ;
+  char fn[len + sizeof(S6_DTALLY_FILENAME) + 1] ;
+  char tmp[n ? S6_DTALLY_PACK * n : 1] ;
+  memcpy(fn, sv, len) ;
+  memcpy(fn + len, "/" S6_DTALLY_FILENAME, sizeof(S6_DTALLY_FILENAME) + 1) ;
+  for (size_t i = 0 ; i < n ; i++) s6_dtally_pack(tmp + i * S6_DTALLY_PACK, tab + i) ;
+  return openwritenclose_suffix(fn, tmp, n * S6_DTALLY_PACK, ".new") ;
+}
diff --git a/src/libs6/s6_svstatus_pack.c b/src/libs6/s6_svstatus_pack.c
index fbce109..ef2d5bd 100644
--- a/src/libs6/s6_svstatus_pack.c
+++ b/src/libs6/s6_svstatus_pack.c
@@ -17,5 +17,6 @@ void s6_svstatus_pack (char *pack, s6_svstatus_t const *sv)
     (sv->flagfinishing << 1) |
     (sv->flagwant << 2) |
     (sv->flagwantup << 3) |
-    (sv->flagready << 4) ;
+    (sv->flagready << 4) |
+    (sv->flagthrottled << 5) ;
 }
diff --git a/src/libs6/s6_svstatus_unpack.c b/src/libs6/s6_svstatus_unpack.c
index dc358d3..b641c8c 100644
--- a/src/libs6/s6_svstatus_unpack.c
+++ b/src/libs6/s6_svstatus_unpack.c
@@ -21,4 +21,5 @@ void s6_svstatus_unpack (char const *pack, s6_svstatus_t *sv)
   sv->flagwant = !!(pack[34] & 4) ;
   sv->flagwantup = !!(pack[34] & 8) ;
   sv->flagready = !!(pack[34] & 16) ;
+  sv->flagthrottled = !!(pack[34] & 32) ;
 }
diff --git a/src/supervision/s6-supervise.c b/src/supervision/s6-supervise.c
index 71f247e..00c2358 100644
--- a/src/supervision/s6-supervise.c
+++ b/src/supervision/s6-supervise.c
@@ -332,6 +332,7 @@ static int uplastup_z (void)
   status.wstat = (int)status.pid ;
   status.flagpaused = 0 ;
   status.flagready = 0 ;
+  status.flagthrottled = 0 ;
   flagdying = 0 ;
   tain_copynow(&status.stamp) ;
   if (notifyfd >= 0)
@@ -339,6 +340,27 @@ static int uplastup_z (void)
     fd_close(notifyfd) ;
     notifyfd = -1 ;
   }
+
+  {
+    unsigned int n ;
+    if (!read_uint("max-death-tally", &n)) n = 20 ;
+    if (n > S6_MAX_DEATH_TALLY) n = S6_MAX_DEATH_TALLY ;
+    if (n)
+    {
+      s6_dtally_t tab[n+1] ;
+      ssize_t m = s6_dtally_read(".", tab, n) ;
+      if (m < 0) strerr_warnwu2sys("read ", S6_DTALLY_FILENAME) ;
+      else
+      {
+        tab[m].stamp = status.stamp ;
+        tab[m].sig = WIFSIGNALED(status.wstat) ? WTERMSIG(status.wstat) : 0 ;
+        tab[m].exitcode = WIFSIGNALED(status.wstat) ? 128 + WTERMSIG(status.wstat) : WEXITSTATUS(status.wstat) ;
+        if (m >= n ? s6_dtally_write(".", tab+1, n) : s6_dtally_write(".", tab, m+1))
+          strerr_warnwu2sys("write ", S6_DTALLY_FILENAME) ;
+      }
+    }
+  }
+
   status.pid = fork() ;
   if (status.pid < 0)
   {
@@ -617,6 +639,11 @@ int main (int argc, char const *const *argv)
     
     if (!ftrigw_clean(S6_SUPERVISE_EVENTDIR))
       strerr_warnwu2sys("ftrigw_clean ", S6_SUPERVISE_EVENTDIR) ;
+    {
+      int fd = open_trunc(S6_DTALLY_FILENAME) ;
+      if (fd < 0) strerr_diefu2sys(111, "truncate ", S6_DTALLY_FILENAME) ;
+      fd_close(fd) ;
+    }
 
     if (access("down", F_OK) == 0) status.flagwantup = 0 ;
     else if (errno != ENOENT)