1 files changed, 104 insertions, 0 deletions
diff --git a/src/supervision/s6-svwait.c b/src/supervision/s6-svwait.c
new file mode 100644
index 0000000..0d7c96c
--- /dev/null
+++ b/src/supervision/s6-svwait.c
@@ -0,0 +1,104 @@
+/* ISC license. */
+
+#include <skalibs/sgetopt.h>
+#include <skalibs/bytestr.h>
+#include <skalibs/uint16.h>
+#include <skalibs/uint.h>
+#include <skalibs/bitarray.h>
+#include <skalibs/tai.h>
+#include <skalibs/strerr2.h>
+#include <skalibs/iopause.h>
+#include <s6/ftrigr.h>
+#include <s6/s6-supervise.h>
+
+#define USAGE "s6-svwait [ -U | -u | -d ] [ -A | -a | -o ] [ -t timeout ] servicedir..."
+#define dieusage() strerr_dieusage(100, USAGE)
+
+static inline int check (unsigned char const *ba, unsigned int n, int wantup, int or)
+{
+  return (bitarray_first(ba, n, or == wantup) < n) == or ;
+}
+
+int main (int argc, char const *const *argv)
+{
+  tain_t deadline, tto ;
+  ftrigr_t a = FTRIGR_ZERO ;
+  uint32 options = FTRIGR_REPEAT ;
+  int or = 0 ;
+  int wantup = 1 ;
+  char re[4] = "u|d" ;
+  PROG = "s6-svwait" ;
+  {
+    subgetopt_t l = SUBGETOPT_ZERO ;
+    unsigned int t = 0 ;
+    for (;;)
+    {
+      register int opt = subgetopt_r(argc, argv, "uUdAaot:", &l) ;
+      if (opt == -1) break ;
+      switch (opt)
+      {
+        case 'U' : wantup = 1 ; re[0] = 'U' ; break ;
+        case 'u' : wantup = 1 ; re[0] = 'u' ; break ;
+        case 'd' : wantup = 0 ; break ;
+        case 'A' : or = 0 ; options |= FTRIGR_REPEAT ; break ;
+        case 'a' : or = 0 ; options &= ~FTRIGR_REPEAT ; break ;
+        case 'o' : or = 1 ; options &= ~FTRIGR_REPEAT ; break ;
+        case 't' : if (!uint0_scan(l.arg, &t)) dieusage() ; break ;
+        default : dieusage() ;
+      }
+    }
+    argc -= l.ind ; argv += l.ind ;
+    if (t) tain_from_millisecs(&tto, t) ; else tto = tain_infinite_relative ;
+  }
+  if (!argc) dieusage() ;
+
+  tain_now_g() ;
+  tain_add_g(&deadline, &tto) ;
+
+  if (!ftrigr_startf_g(&a, &deadline)) strerr_diefu1sys(111, "ftrigr_startf") ;
+
+  {
+    iopause_fd x = { -1, IOPAUSE_READ, 0 } ;
+    unsigned int i = 0 ;
+    uint16 list[argc] ;
+    unsigned char states[bitarray_div8(argc)] ;
+    x.fd = ftrigr_fd(&a) ;
+    for (; i < (unsigned int)argc ; i++)
+    {
+      unsigned int len = str_len(argv[i]) ;
+      char s[len + 1 + sizeof(S6_SUPERVISE_EVENTDIR)] ;
+      byte_copy(s, len, argv[i]) ;
+      s[len] = '/' ;
+      byte_copy(s + len + 1, sizeof(S6_SUPERVISE_EVENTDIR), S6_SUPERVISE_EVENTDIR) ;
+      list[i] = ftrigr_subscribe_g(&a, s, re, options, &deadline) ;
+      if (!list[i]) strerr_diefu2sys(111, "ftrigr_subscribe to ", argv[i]) ;
+    }
+
+    for (i = 0 ; i < (unsigned int)argc ; i++)
+    {
+      s6_svstatus_t st = S6_SVSTATUS_ZERO ;
+      if (!s6_svstatus_read(argv[i], &st)) strerr_diefu1sys(111, "s6_svstatus_read") ;
+      bitarray_poke(states, i, !!st.pid) ;
+    }
+
+    for (;;)
+    {
+      if (check(states, argc, wantup, or)) break ;
+      {
+        register int r = iopause_g(&x, 1, &deadline) ;
+        if (r < 0) strerr_diefu1sys(111, "iopause") ;
+        else if (!r) strerr_dief1x(1, "timed out") ;
+      }
+
+      if (ftrigr_update(&a) < 0) strerr_diefu1sys(111, "ftrigr_update") ;
+      for (i = 0 ; i < (unsigned int)argc ; i++)
+      {
+        char what ;
+        register int r = ftrigr_check(&a, list[i], &what) ;
+        if (r < 0) strerr_diefu1sys(111, "ftrigr_check") ;
+        if (r) bitarray_poke(states, i, what == re[0]) ;
+      } 
+    }
+  }
+  return 0 ;
+}