X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore%2Fstore-private.h;h=14201fe071a77a65ba20b0b17b36a80f1a35d3fd;hb=56b97a180a53aecbfe9f7162b8ece3faae973cf9;hp=49ddaf547465f349b8ba57aede974e0388628652;hpb=fd3e376f4c7dc24c40717c056548c4e26e4e8b97;p=sysdb.git

diff --git a/src/core/store-private.h b/src/core/store-private.h
index 49ddaf5..14201fe 100644
--- a/src/core/store-private.h
+++ b/src/core/store-private.h
@@ -41,7 +41,7 @@
 extern "C" {
 #endif
 
-struct sdb_store_base {
+struct sdb_store_obj {
 	sdb_object_t super;
 
 	/* object type */
@@ -50,30 +50,37 @@ struct sdb_store_base {
 	/* common meta information */
 	sdb_time_t last_update;
 	sdb_time_t interval; /* moving average */
-	sdb_store_base_t *parent;
+	sdb_store_obj_t *parent;
 };
-#define STORE_BASE(obj) ((sdb_store_base_t *)(obj))
-#define STORE_CONST_BASE(obj) ((const sdb_store_base_t *)(obj))
+#define STORE_OBJ(obj) ((sdb_store_obj_t *)(obj))
+#define STORE_CONST_OBJ(obj) ((const sdb_store_obj_t *)(obj))
 
 typedef struct {
-	sdb_store_base_t super;
+	sdb_store_obj_t super;
 
 	sdb_data_t value;
 } sdb_attribute_t;
-#define SDB_ATTR(obj) ((sdb_attribute_t *)(obj))
-#define SDB_CONST_ATTR(obj) ((const sdb_attribute_t *)(obj))
+#define ATTR(obj) ((sdb_attribute_t *)(obj))
+#define CONST_ATTR(obj) ((const sdb_attribute_t *)(obj))
 
 typedef struct {
-	sdb_store_base_t super;
+	sdb_store_obj_t super;
 
-	sdb_llist_t *children;
 	sdb_llist_t *attributes;
-} sdb_store_obj_t;
-#define SDB_STORE_OBJ(obj) ((sdb_store_obj_t *)(obj))
-#define SDB_CONST_STORE_OBJ(obj) ((const sdb_store_obj_t *)(obj))
+} sdb_service_t;
+#define SVC(obj) ((sdb_service_t *)(obj))
+#define CONST_SVC(obj) ((const sdb_service_t *)(obj))
 
-/* shortcuts for accessing the sdb_store_obj_t attributes
- * of inheriting objects */
+typedef struct {
+	sdb_store_obj_t super;
+
+	sdb_llist_t *services;
+	sdb_llist_t *attributes;
+} sdb_host_t;
+#define HOST(obj) ((sdb_host_t *)(obj))
+#define CONST_HOST(obj) ((const sdb_host_t *)(obj))
+
+/* shortcuts for accessing service/host attributes */
 #define _last_update super.last_update
 #define _interval super.interval
 
@@ -81,8 +88,8 @@ typedef struct {
  * conditionals
  */
 
-/* compares a store object using the specified conditional */
-typedef int (*cmp_cb)(sdb_store_base_t *, sdb_store_cond_t *);
+/* compares a host using the specified conditional */
+typedef int (*cmp_cb)(sdb_host_t *, sdb_store_cond_t *);
 
 struct sdb_store_cond {
 	sdb_object_t super;
@@ -174,8 +181,6 @@ typedef struct {
 typedef struct {
 	sdb_store_matcher_t super;
 	char *name;
-	/* XXX: this needs to be more flexible;
-	 *      add support for type-specific operators */
 	string_matcher_t value;
 } attr_matcher_t;
 #define ATTR_M(m) ((attr_matcher_t *)(m))