diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2021-08-30 19:11:44 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2021-08-30 19:11:44 +0000 |
| commit | 691c69e626e4ceb85567a5288348bd04378fd410 (patch) | |
| tree | 9ae1c3f2c2984aafa2b9caf7987fe0011fcf6828 /src/include | |
| parent | 1719a60278cf36558b568349c0c9f9b5eb91c999 (diff) | |
| download | s6-691c69e626e4ceb85567a5288348bd04378fd410.tar.xz | |
s6-svlink, s6-svunlink, .h changes
Renamed from s6-svdir-(un)link.
Doc added. Full functionality added.
Still need to be tested.
Unrelated: .h names simplified.
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/s6/fdholder.h (renamed from src/include/s6/s6-fdholder.h) | 0 | ||||
| -rw-r--r-- | src/include/s6/lock.h (renamed from src/include/s6/s6lock.h) | 6 | ||||
| -rw-r--r-- | src/include/s6/s6.h | 4 | ||||
| -rw-r--r-- | src/include/s6/supervise.h (renamed from src/include/s6/s6-supervise.h) | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/include/s6/s6-fdholder.h b/src/include/s6/fdholder.h index 62b9ab7..62b9ab7 100644 --- a/src/include/s6/s6-fdholder.h +++ b/src/include/s6/fdholder.h diff --git a/src/include/s6/s6lock.h b/src/include/s6/lock.h index b1848c7..e87e001 100644 --- a/src/include/s6/s6lock.h +++ b/src/include/s6/lock.h @@ -1,13 +1,15 @@ /* ISC license. */ -#ifndef S6LOCK_H -#define S6LOCK_H +#ifndef S6_LOCK_H +#define S6_LOCK_H #include <stdint.h> + #include <skalibs/tai.h> #include <skalibs/genalloc.h> #include <skalibs/gensetdyn.h> #include <skalibs/textclient.h> + #include <s6/config.h> diff --git a/src/include/s6/s6.h b/src/include/s6/s6.h index aabcc13..5b32a86 100644 --- a/src/include/s6/s6.h +++ b/src/include/s6/s6.h @@ -4,10 +4,10 @@ #define S6_H #include <s6/compat.h> -#include <s6/s6-supervise.h> +#include <s6/supervise.h> #include <s6/ftrigr.h> #include <s6/ftrigw.h> #include <s6/accessrules.h> -#include <s6/s6lock.h> +#include <s6/lock.h> #endif diff --git a/src/include/s6/s6-supervise.h b/src/include/s6/supervise.h index c0dc1b6..914bff3 100644 --- a/src/include/s6/s6-supervise.h +++ b/src/include/s6/supervise.h @@ -30,10 +30,8 @@ struct s6_svstatus_s int wstat ; unsigned int flagpaused : 1 ; unsigned int flagfinishing : 1 ; - unsigned int flagwant : 1 ; /* unused */ unsigned int flagwantup : 1 ; unsigned int flagready : 1 ; - unsigned int flagthrottled : 1 ; } ; #define S6_SVSTATUS_ZERO \ @@ -44,10 +42,8 @@ struct s6_svstatus_s .wstat = 0, \ .flagpaused = 0, \ .flagfinishing = 0, \ - .flagwant = 1, \ .flagwantup = 1, \ .flagready = 1, \ - .flagthrottled = 0 \ } extern void s6_svstatus_pack (char *, s6_svstatus_t const *) ; @@ -60,6 +56,8 @@ extern int s6_supervise_link (char const *, char const *const *, size_t, char co extern int s6_supervise_link_names (char const *, char const *const *, char const *const *, size_t, uint32_t, tain const *, tain *) ; #define s6_supervise_link_names_g(scdir, servicedirs, names, n, options, deadline) s6_supervise_link_names(scdir, servicedirs, names, n, options, (deadline), &STAMP) extern void s6_supervise_unlink (char const *, char const *, uint32_t) ; +extern int s6_supervise_unlink_names (char const *, char const *const *, size_t, uint32_t, tain const *, tain *) ; +#define s6_supervise_unlink_names_g(scdir, names, n, options, deadline) s6_supervise_unlink_names(scdir, names, n, options, (deadline), &STAMP) typedef struct s6_dtally_s s6_dtally_t, *s6_dtally_ref ; struct s6_dtally_s |