index 7479bc69ad25082c26ecbc542bbc4f7563b40809..1633d42c5672e867bec3de21b10153b6c7931274 100644 (file)
--- a/src/core/store-private.h
+++ b/src/core/store-private.h
#define SVC(obj) ((sdb_service_t *)(obj))
#define CONST_SVC(obj) ((const sdb_service_t *)(obj))
#define SVC(obj) ((sdb_service_t *)(obj))
#define CONST_SVC(obj) ((const sdb_service_t *)(obj))
+typedef struct {
+ sdb_store_obj_t super;
+
+ sdb_avltree_t *attributes;
+ struct {
+ char *type;
+ char *id;
+ } store;
+} sdb_metric_t;
+#define METRIC(obj) ((sdb_metric_t *)(obj))
+
typedef struct {
sdb_store_obj_t super;
sdb_avltree_t *services;
typedef struct {
sdb_store_obj_t super;
sdb_avltree_t *services;
+ sdb_avltree_t *metrics;
sdb_avltree_t *attributes;
} sdb_host_t;
#define HOST(obj) ((sdb_host_t *)(obj))
sdb_avltree_t *attributes;
} sdb_host_t;
#define HOST(obj) ((sdb_host_t *)(obj))
#define _last_update super.last_update
#define _interval super.interval
#define _last_update super.last_update
#define _interval super.interval
+/*
+ * expressions
+ */
+enum {
+ ATTR_VALUE = -2, /* attr name stored in data.data.string */
+ FIELD_VALUE = -1, /* field type stored in data.data.integer */
+ /* 0: const value (stored in data) */
+ /* >0: operator id */
+};
+
+struct sdb_store_expr {
+ sdb_object_t super;
+
+ int type; /* see above */
+
+ sdb_store_expr_t *left;
+ sdb_store_expr_t *right;
+
+ sdb_data_t data;
+};
+
/*
* conditionals
*/
/*
* conditionals
*/
-/* compares a host using the specified conditional */
-typedef int (*cmp_cb)(sdb_host_t *, sdb_store_cond_t *);
+/* compares an object using the specified conditional and taking the specified
+ * filter into account */
+typedef int (*cmp_cb)(sdb_store_obj_t *, sdb_store_cond_t *,
+ sdb_store_matcher_t *);
struct sdb_store_cond {
sdb_object_t super;
struct sdb_store_cond {
sdb_object_t super;
typedef struct {
sdb_store_cond_t super;
char *name;
typedef struct {
sdb_store_cond_t super;
char *name;
- sdb_data_t value;
+ sdb_store_expr_t *expr;
} attr_cond_t;
#define ATTR_C(obj) ((attr_cond_t *)(obj))
} attr_cond_t;
#define ATTR_C(obj) ((attr_cond_t *)(obj))
+typedef struct {
+ sdb_store_cond_t super;
+ int field;
+ sdb_store_expr_t *expr;
+} obj_cond_t;
+#define OBJ_C(obj) ((obj_cond_t *)(obj))
+
/*
* matchers
*/
/*
* matchers
*/
-/* when adding to this, also update 'matchers' and 'matchers_tostring'
- * in store_lookup.c */
+/* when adding to this, also update 'MATCHER_SYM' below as well as 'matchers'
+ * and 'matchers_tostring' in store_lookup.c */
enum {
MATCHER_OR,
MATCHER_AND,
MATCHER_NOT,
MATCHER_NAME,
MATCHER_ATTR,
enum {
MATCHER_OR,
MATCHER_AND,
MATCHER_NOT,
MATCHER_NAME,
MATCHER_ATTR,
+ MATCHER_SERVICE,
+ MATCHER_METRIC,
+ MATCHER_ATTRIBUTE,
MATCHER_LT,
MATCHER_LE,
MATCHER_EQ,
MATCHER_GE,
MATCHER_GT,
MATCHER_LT,
MATCHER_LE,
MATCHER_EQ,
MATCHER_GE,
MATCHER_GT,
+ MATCHER_CMP_LT,
+ MATCHER_CMP_LE,
+ MATCHER_CMP_EQ,
+ MATCHER_CMP_GE,
+ MATCHER_CMP_GT,
+ MATCHER_REGEX,
MATCHER_ISNULL,
};
MATCHER_ISNULL,
};
: ((t) == MATCHER_NOT) ? "NOT" \
: ((t) == MATCHER_NAME) ? "NAME" \
: ((t) == MATCHER_ATTR) ? "ATTR" \
: ((t) == MATCHER_NOT) ? "NOT" \
: ((t) == MATCHER_NAME) ? "NAME" \
: ((t) == MATCHER_ATTR) ? "ATTR" \
+ : ((t) == MATCHER_SERVICE) ? "SERVICE" \
+ : ((t) == MATCHER_METRIC) ? "METRIC" \
+ : ((t) == MATCHER_ATTRIBUTE) ? "ATTRIBUTE" \
: ((t) == MATCHER_LT) ? "<" \
: ((t) == MATCHER_LE) ? "<=" \
: ((t) == MATCHER_EQ) ? "=" \
: ((t) == MATCHER_GE) ? ">=" \
: ((t) == MATCHER_GT) ? ">" \
: ((t) == MATCHER_LT) ? "<" \
: ((t) == MATCHER_LE) ? "<=" \
: ((t) == MATCHER_EQ) ? "=" \
: ((t) == MATCHER_GE) ? ">=" \
: ((t) == MATCHER_GT) ? ">" \
+ : ((t) == MATCHER_REGEX) ? "=~" \
: ((t) == MATCHER_ISNULL) ? "IS NULL" \
: "UNKNOWN")
: ((t) == MATCHER_ISNULL) ? "IS NULL" \
: "UNKNOWN")
} uop_matcher_t;
#define UOP_M(m) ((uop_matcher_t *)(m))
} uop_matcher_t;
#define UOP_M(m) ((uop_matcher_t *)(m))
+/* child matcher */
+typedef struct {
+ sdb_store_matcher_t super;
+ sdb_store_matcher_t *m;
+} child_matcher_t;
+#define CHILD_M(m) ((child_matcher_t *)(m))
+
+/* compare operator matcher */
+typedef struct {
+ sdb_store_matcher_t super;
+
+ /* left and right hand expressions */
+ sdb_store_expr_t *left;
+ sdb_store_expr_t *right;
+} cmp_matcher_t;
+#define CMP_M(m) ((cmp_matcher_t *)(m))
+
/* match any type of object by it's name */
typedef struct {
sdb_store_matcher_t super;
/* match any type of object by it's name */
typedef struct {
sdb_store_matcher_t super;