index dfa3e845d13e330101c86f59e0d03598bb2ee351..f08bf1d2c2217fcde9565fcf964bd1567eceeed4 100644 (file)
--- a/src/core/store-private.h
+++ b/src/core/store-private.h
sdb_store_obj_t super;
sdb_data_t value;
-} sdb_attribute_t;
-#define ATTR(obj) ((sdb_attribute_t *)(obj))
-#define CONST_ATTR(obj) ((const sdb_attribute_t *)(obj))
+} attr_t;
+#define ATTR(obj) ((attr_t *)(obj))
+#define CONST_ATTR(obj) ((const attr_t *)(obj))
typedef struct {
sdb_store_obj_t super;
sdb_avltree_t *attributes;
-} sdb_service_t;
-#define SVC(obj) ((sdb_service_t *)(obj))
-#define CONST_SVC(obj) ((const sdb_service_t *)(obj))
+} service_t;
+#define SVC(obj) ((service_t *)(obj))
+#define CONST_SVC(obj) ((const service_t *)(obj))
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))
-#define CONST_HOST(obj) ((const sdb_host_t *)(obj))
+} host_t;
+#define HOST(obj) ((host_t *)(obj))
+#define CONST_HOST(obj) ((const host_t *)(obj))
/* shortcuts for accessing service/host attributes */
#define _last_update super.last_update
MATCHER_ANY,
MATCHER_ALL,
MATCHER_IN,
- MATCHER_NIN,
/* unary operators */
MATCHER_ISNULL,
- MATCHER_ISNNULL,
+ MATCHER_ISTRUE,
+ MATCHER_ISFALSE,
/* ary operators */
MATCHER_LT,
: ((t) == MATCHER_ANY) ? "ANY" \
: ((t) == MATCHER_ALL) ? "ALL" \
: ((t) == MATCHER_IN) ? "IN" \
- : ((t) == MATCHER_NIN) ? "NOT IN" \
: ((t) == MATCHER_ISNULL) ? "IS NULL" \
- : ((t) == MATCHER_ISNNULL) ? "IS NOT NULL" \
+ : ((t) == MATCHER_ISTRUE) ? "IS TRUE" \
+ : ((t) == MATCHER_ISFALSE) ? "IS FALSE" \
: ((t) == MATCHER_LT) ? "<" \
: ((t) == MATCHER_LE) ? "<=" \
: ((t) == MATCHER_EQ) ? "=" \
typedef struct {
sdb_store_matcher_t super;
sdb_store_expr_t *expr;
-} isnull_matcher_t;
-#define ISNULL_M(m) ((isnull_matcher_t *)(m))
+} unary_matcher_t;
+#define UNARY_M(m) ((unary_matcher_t *)(m))
#ifdef __cplusplus
} /* extern "C" */