1 files changed, 14 insertions, 78 deletions

diff --git a/src/supervision/s6-svwait.c b/src/supervision/s6-svwait.c
index fa8d227..1793347 100644
--- a/src/supervision/s6-svwait.c
+++ b/src/supervision/s6-svwait.c
@@ -1,46 +1,35 @@
 /* ISC license. */
 
-#include <unistd.h>
-#include <errno.h>
 #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>
+#include "s6-svlisten.h"
 
-#define USAGE "s6-svwait [ -U | -u | -d ] [ -a | -o ] [ -t timeout ] servicedir..."
+#define USAGE "s6-svwait [ -U | -u | -d | -D ] [ -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 ;
   int or = 0 ;
-  int wantup = 1 ;
-  char re[4] = "u|d" ;
+  int wantup = 1, wantready = 0 ;
   PROG = "s6-svwait" ;
   {
     subgetopt_t l = SUBGETOPT_ZERO ;
     unsigned int t = 0 ;
     for (;;)
     {
-      register int opt = subgetopt_r(argc, argv, "uUdaot:", &l) ;
+      register int opt = subgetopt_r(argc, argv, "UudDaot:", &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 'U' : wantup = 1 ; wantready = 1 ; break ;
+        case 'u' : wantup = 1 ; wantready = 0 ; break ;
+        case 'd' : wantup = 0 ; wantready = 0 ; break ;
+        case 'D' : wantup = 0 ; wantready = 1 ; break ;
         case 'a' : or = 0 ; break ;
         case 'o' : or = 1 ; break ;
         case 't' : if (!uint0_scan(l.arg, &t)) dieusage() ; break ;
@@ -55,65 +44,12 @@ int main (int argc, char const *const *argv)
   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, FTRIGR_REPEAT, &deadline) ;
-      if (!list[i]) strerr_diefu2sys(111, "subscribe to events for ", argv[i]) ;
-    }
-
-    for (i = 0 ; i < (unsigned int)argc ; i++)
-    {
-      s6_svstatus_t st = S6_SVSTATUS_ZERO ;
-      int isup ;
-      if (!s6_svstatus_read(argv[i], &st)) strerr_diefu1sys(111, "s6_svstatus_read") ;
-      isup = !!st.pid ;
-      if (re[0] == 'U' && isup)
-      {
-        unsigned int len = str_len(argv[i]) ;
-        char s[len + 1 + sizeof(S6_SUPERVISE_READY_FILENAME)] ;
-        byte_copy(s, len, argv[i]) ;
-        s[len] = '/' ;
-        byte_copy(s + len + 1, sizeof(S6_SUPERVISE_READY_FILENAME), S6_SUPERVISE_READY_FILENAME) ;
-        if (access(s, F_OK) < 0)
-        {
-          if (errno == ENOENT) isup = 0 ;
-          else strerr_warnwu2sys("check ", s) ;
-        }
-      }
-      bitarray_poke(states, i, isup) ;
-    }
-
-    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]) ;
-      } 
-    }
+    s6_svlisten_t foo = S6_SVLISTEN_ZERO ;
+    uint16 ids[argc] ;
+    unsigned char upstate[bitarray_div8(argc)] ;
+    unsigned char readystate[bitarray_div8(argc)] ;
+    s6_svlisten_init(argc, argv, &foo, ids, upstate, readystate, &deadline) ;
+    return s6_svlisten_loop(&foo, wantup, wantready, or, &deadline, -1, 0) ;
   }
-  return 0 ;
 }