X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Finclude%2Fcore%2Fstore.h;h=14cb7c03cb36511c16bad98b4c213d12bc877083;hb=30a857cf51e15b453348ea95a13007e60a4f3812;hp=46cd53643a7ec8b1d63a5431d4fde5dc3b94c2fb;hpb=ec7449c79712d8fa29d63b7e8f1f08e183b916a1;p=sysdb.git

diff --git a/src/include/core/store.h b/src/include/core/store.h
index 46cd536..14cb7c0 100644
--- a/src/include/core/store.h
+++ b/src/include/core/store.h
@@ -30,7 +30,7 @@
 
 #include "sysdb.h"
 #include "core/object.h"
-#include "utils/time.h"
+#include "core/time.h"
 #include "utils/llist.h"
 
 #include <stdio.h>
@@ -39,59 +39,58 @@
 extern "C" {
 #endif
 
-typedef struct {
-	sdb_object_t parent;
+extern const sdb_type_t sdb_host_type;
+extern const sdb_type_t sdb_attribute_type;
+extern const sdb_type_t sdb_service_type;
 
+typedef struct {
+	sdb_object_t super;
 	sdb_time_t last_update;
-	char *name;
 } sdb_store_obj_t;
-#define SDB_STORE_OBJ_INIT { SDB_OBJECT_INIT, 0, NULL }
+#define SDB_STORE_OBJ_INIT(t) { SDB_OBJECT_TYPED_INIT(t), 0 }
 #define SDB_STORE_OBJ(obj) ((sdb_store_obj_t *)(obj))
+#define SDB_CONST_STORE_OBJ(obj) ((const sdb_store_obj_t *)(obj))
 
 typedef struct {
-	sdb_store_obj_t parent;
+	sdb_store_obj_t super;
 
 	char *hostname;
 } sdb_service_t;
-#define SDB_SVC_INIT { SDB_STORE_OBJ_INIT, NULL }
+#define SDB_SVC_INIT { SDB_STORE_OBJ_INIT(sdb_service_type), NULL }
 #define SDB_SVC(obj) ((sdb_service_t *)(obj))
+#define SDB_CONST_SVC(obj) ((const sdb_service_t *)(obj))
 
 typedef struct {
-	sdb_store_obj_t parent;
+	sdb_store_obj_t super;
 
 	char *attr_value;
 	char *hostname;
 } sdb_attribute_t;
-#define SDB_ATTR_INIT { SDB_STORE_OBJ_INIT, NULL, NULL }
+#define SDB_ATTR_INIT { SDB_STORE_OBJ_INIT(sdb_attribute_type), NULL, NULL }
 #define SDB_ATTR(obj) ((sdb_attribute_t *)(obj))
+#define SDB_CONST_ATTR(obj) ((const sdb_attribute_t *)(obj))
 
 typedef struct {
-	sdb_store_obj_t parent;
+	sdb_store_obj_t super;
 
 	sdb_llist_t *attributes;
 	sdb_llist_t *services;
 } sdb_host_t;
-#define SDB_HOST_INIT { SDB_STORE_OBJ_INIT, NULL, NULL }
+#define SDB_HOST_INIT { SDB_STORE_OBJ_INIT(sdb_host_type), NULL, NULL }
 #define SDB_HOST(obj) ((sdb_host_t *)(obj))
+#define SDB_CONST_HOST(obj) ((const sdb_host_t *)(obj))
 
 /* shortcuts for accessing the sdb_store_obj_t attributes of inheriting
  * objects */
-#define _last_update parent.last_update
-#define _name parent.name
-
-sdb_host_t *
-sdb_host_create(const char *name);
-
-sdb_host_t *
-sdb_host_clone(const sdb_host_t *host);
+#define _last_update super.last_update
 
 /*
  * sdb_store_host:
- * Add/update a host in the store. If the host, identified by its name,
- * already exists, it will be updated according to the specified 'host'
- * object. Else, a new entry will be created in the store. Any memory required
- * for storing the entry will be allocated an managed by the store itself. The
- * specified host-object will not be referenced or further accessed.
+ * Add/update a host in the store. If the host, identified by its
+ * canonicalized name, already exists, it will be updated according to the
+ * specified name and timestamp. Else, a new entry will be created in the
+ * store. Any memory required for storing the entry will be allocated an
+ * managed by the store itself.
  *
  * Returns:
  *  - 0 on success
@@ -100,17 +99,10 @@ sdb_host_clone(const sdb_host_t *host);
  *  - a negative value on error
  */
 int
-sdb_store_host(const sdb_host_t *host);
+sdb_store_host(const char *name, sdb_time_t last_update);
 
-const sdb_host_t *
-sdb_store_get_host(const char *name);
-
-sdb_attribute_t *
-sdb_attribute_create(const char *hostname,
-		const char *name, const char *value);
-
-sdb_attribute_t *
-sdb_attribute_clone(const sdb_attribute_t *attr);
+_Bool
+sdb_store_has_host(const char *name);
 
 /*
  * sdb_store_attribute:
@@ -131,12 +123,6 @@ sdb_attribute_clone(const sdb_attribute_t *attr);
 int
 sdb_store_attribute(const sdb_attribute_t *attr);
 
-sdb_service_t *
-sdb_service_create(const char *hostname, const char *name);
-
-sdb_service_t *
-sdb_service_clone(const sdb_service_t *svc);
-
 /*
  * sdb_store_service:
  * Add/update a store in the store. If the service, identified by its name,