New id/typenum mapping, monitor filter, cdb in db_load, etc.

Signed-off-by: Laurent Bercot <ska@appnovation.com>

1 files changed, 0 insertions, 103 deletions

diff --git a/src/include-local/db.h b/src/include-local/db.h
deleted file mode 100644
index b35fc42..0000000
--- a/src/include-local/db.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* ISC license. */
-
-#ifndef S6RCD_SERVICE_H
-#define S6RCD_SERVICE_H
-
-#include <stdint.h>
-
-#include <skalibs/cdb.h>
-
-#define S6RC_ARGV_MAX 0x00ffffffu
-#define S6RC_INSTANCES_MAX 0x00ffffffu
-#define S6RC_INSTANCEPARAM_MAXLEN 0x00ffffffu
-
- /* Service types and db representation in memory */
-
-#define S6RC_STYPE_LONGRUN 0
-#define S6RC_STYPE_ONESHOT 1
-#define S6RC_STYPE_EXTERNAL 2
-#define S6RC_STYPE_BUNDLE 3
-#define S6RC_STYPE_VIRTUAL 4
-#define S6RC_STYPE_N 5
-
-typedef uint32_t s6rc_id_t, *s6rc_id_t_ref ;
-
-#define stype(sid) ((sid) >> 28)
-#define snum(sid) ((sid) & 0x0fffffffu)
-
-typedef struct s6rc_common_s s6rc_common_t, *s6rc_common_t_ref ;
-struct s6rc_common_s
-{
-  uint32_t name ;
-  uint32_t flags ;
-  uint32_t deps[2] ;
-  uint32_t ndeps[2] ;
-} ;
-
-#define S6RC_DB_FLAG_ESSENTIAL 0x80000000u
-#define S6RC_DB_FLAG_WEAK 0x40000000u
-
-typedef struct s6rc_atomic_s s6rc_atomic_t, *s6rc_atomic_t_ref ;
-struct s6rc_atomic_s
-{
-  s6rc_common_t common ;
-  uint32_t timeout[2] ;
-} ;
-
-typedef struct s6rc_oneshot_s s6rc_oneshot_t, *s6rc_oneshot_t_ref ;
-struct s6rc_oneshot_s
-{
-  s6rc_atomic_t satomic ;
-  uint32_t argv[2] ;
-} ;
-
-typedef struct s6rc_longrun_s s6rc_longrun_t, *s6rc_longrun_t_ref ;
-struct s6rc_longrun_s
-{
-  s6rc_atomic_t satomic ;
-  uint32_t nproducers ;
-  uint32_t producers ;
-  s6rc_id_t consumer ;
-} ;
-
-typedef struct s6rc_external_s s6rc_external_t, *s6rc_external_t_ref ;
-struct s6rc_external_s
-{
-  s6rc_common_t common ;
-} ;
-
-typedef struct s6rc_bundle_s s6rc_bundle_t, *s6rc_bundle_t_ref ;
-struct s6rc_bundle_s
-{
-  s6rc_common_t common ;
-  uint32_t ncontents ;
-  uint32_t contents ;
-} ;
-
-#define s6rc_deptype_passive(dep) ((dep) & 0x01u)
-#define s6rc_deptype_soft(dep) ((dep) & 0x02u)
-#define s6rc_deptype_loose(dep) ((dep) & 0x04u)
-
-typedef struct s6rc_db_s s6rc_db_t, *s6rc_db_t_ref ;
-struct s6rc_db_s
-{
-  char const *map ;
-  size_t size ;
-  uint32_t const *n ;
-  s6rc_longrun_t const *longruns ;
-  s6rc_oneshot_t const *oneshots ;
-  s6rc_external_t const *externals ;
-  s6rc_bundle_t const *bundles ;
-  s6rc_bundle_t const *virtuals ;
-  s6rc_id_t const *deps[2] ;
-  uint8_t const *deptypes[2] ;
-  s6rc_id_t const *producers ;
-  char const *storage ;
-  char const **argvs ;  /* alloced */
-} ;
-#define S6RC_DB_ZERO = { .map = 0, .len = 0 }
-
-extern int s6rc_service_resolve (cdb_t *, char const *, s6rc_id_t *, char const **) ;
-extern s6rc_common_t const *s6rc_service_common (s6rc_db_t const *, s6rc_id_t) ;
-
-#endif