summaryrefslogtreecommitdiff
path: root/src/fdholder/s6-fdholder-getdump.c
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2019-07-03 12:43:13 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2019-07-03 12:43:13 +0000
commit1d69f26f58e72ceaab5aeda7df874faf7b46a5f3 (patch)
tree7c5551b0210f44de4e4b8188e20712edab505fab /src/fdholder/s6-fdholder-getdump.c
parentdaef3467ef868740c1dc8d89f11c04b91b3fdb47 (diff)
downloads6-1d69f26f58e72ceaab5aeda7df874faf7b46a5f3.tar.xz
Remove s6-fdholder-*c programs
The doc still needs to be updated.
Diffstat (limited to 'src/fdholder/s6-fdholder-getdump.c')
-rw-r--r--src/fdholder/s6-fdholder-getdump.c83
1 files changed, 56 insertions, 27 deletions
diff --git a/src/fdholder/s6-fdholder-getdump.c b/src/fdholder/s6-fdholder-getdump.c
index 5e0e3f6..89069e9 100644
--- a/src/fdholder/s6-fdholder-getdump.c
+++ b/src/fdholder/s6-fdholder-getdump.c
@@ -1,20 +1,27 @@
/* ISC license. */
+#include <string.h>
+#include <limits.h>
#include <skalibs/types.h>
-#include <skalibs/sgetopt.h>
#include <skalibs/strerr2.h>
+#include <skalibs/sgetopt.h>
+#include <skalibs/tai.h>
+#include <skalibs/env.h>
#include <skalibs/djbunix.h>
-#include <execline/config.h>
-#include <s6/config.h>
+#include <skalibs/genalloc.h>
+#include <s6/s6-fdholder.h>
#define USAGE "s6-fdholder-getdump [ -t timeout ] socket prog..."
#define dieusage() strerr_dieusage(100, USAGE)
int main (int argc, char const *const *argv, char const *const *envp)
{
- unsigned int timeout = 0 ;
- PROG = "s6-fdholder-retrieve" ;
+ s6_fdholder_t a = S6_FDHOLDER_ZERO ;
+ genalloc dump = GENALLOC_ZERO ;
+ tain_t deadline, halfinfinite ;
+ PROG = "s6-fdholder-getdump" ;
{
+ unsigned int t = 0 ;
subgetopt_t l = SUBGETOPT_ZERO ;
for (;;)
{
@@ -22,36 +29,58 @@ int main (int argc, char const *const *argv, char const *const *envp)
if (opt == -1) break ;
switch (opt)
{
- case 't' : if (!uint0_scan(l.arg, &timeout)) dieusage() ; break ;
+ case 't' : if (!uint0_scan(l.arg, &t)) dieusage() ; break ;
default : dieusage() ;
}
}
argc -= l.ind ; argv += l.ind ;
- if (argc < 2) dieusage() ;
+ if (t) tain_from_millisecs(&deadline, t) ;
+ else deadline = tain_infinite_relative ;
}
+ if (argc < 2) dieusage() ;
+ tain_now_g() ;
+ tain_add_g(&deadline, &deadline) ;
+ if (!s6_fdholder_start_g(&a, argv[0], &deadline))
+ strerr_diefu2sys(111, "connect to a fd-holder daemon at ", argv[0]) ;
+ if (!s6_fdholder_getdump_g(&a, &dump, &deadline))
+ strerr_diefu1sys(1, "get dump") ;
+ s6_fdholder_end(&a) ;
+ tain_half(&halfinfinite, &tain_infinite_relative) ;
+ tain_add_g(&halfinfinite, &halfinfinite) ;
{
- char const *newargv[12 + argc] ;
- unsigned int m = 0 ;
- char fmtt[UINT_FMT] ;
- newargv[m++] = S6_BINPREFIX "s6-ipcclient" ;
- newargv[m++] = "-l0" ;
- newargv[m++] = "--" ;
- newargv[m++] = *argv++ ;
- newargv[m++] = S6_BINPREFIX "s6-fdholder-getdumpc" ;
- if (timeout)
+ size_t n = genalloc_len(s6_fdholder_fd_t, &dump) ;
+ size_t pos = 0 ;
+ unsigned int i = 0 ;
+ char modifs[7 + UINT_FMT + (25 + TIMESTAMP + 4 * UINT_FMT) * n] ;
+ if (n > UINT_MAX) strerr_dief1x(100, "dump exceeds maximum size") ;
+ memcpy(modifs + pos, "S6_FD#=", 7) ; pos += 7 ;
+ pos += uint_fmt(modifs + pos, n) ;
+ modifs[pos++] = 0 ;
+ for (; i < n ; i++)
{
- fmtt[uint_fmt(fmtt, timeout)] = 0 ;
- newargv[m++] = "-t" ;
- newargv[m++] = fmtt ;
+ s6_fdholder_fd_t *p = genalloc_s(s6_fdholder_fd_t, &dump) + i ;
+ size_t len = strlen(p->id) + 1 ;
+ if (uncoe(p->fd) < 0) strerr_diefu1sys(111, "uncoe") ;
+ memcpy(modifs + pos, "S6_FD_", 6) ; pos += 6 ;
+ pos += uint_fmt(modifs + pos, i) ;
+ modifs[pos++] = '=' ;
+ pos += uint_fmt(modifs + pos, p->fd) ;
+ modifs[pos++] = 0 ;
+ memcpy(modifs + pos, "S6_FDID_", 8) ; pos += 8 ;
+ pos += uint_fmt(modifs + pos, i) ;
+ modifs[pos++] = '=' ;
+ memcpy(modifs + pos, p->id, len) ;
+ pos += len ;
+ memcpy(modifs + pos, "S6_FDLIMIT_", 11) ; pos += 11 ;
+ pos += uint_fmt(modifs + pos, i) ;
+ if (tain_less(&p->limit, &halfinfinite))
+ {
+ modifs[pos++] = '=' ;
+ pos += timestamp_fmt(modifs + pos, &p->limit) ;
+ }
+ modifs[pos++] = 0 ;
}
- newargv[m++] = "--" ;
- newargv[m++] = EXECLINE_EXTBINPREFIX "fdclose" ;
- newargv[m++] = "6" ;
- newargv[m++] = EXECLINE_EXTBINPREFIX "fdclose" ;
- newargv[m++] = "7" ;
- while (*argv) newargv[m++] = *argv++ ;
- newargv[m++] = 0 ;
- xpathexec_run(newargv[0], newargv, envp) ;
+ xpathexec_r(argv+1, envp, env_len(envp), modifs, pos) ;
}
}