X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcore%2Fstore.c;h=22e177ca8f95d4a1246f443b73f0457f48678f2f;hb=e2fbe0efeb9be4c61911a18b337dc89ca351ca81;hp=2522233112a8d125024d9853710ff90565f768d4;hpb=c9ed4d2a7a92ef589809a7df9b04c061afa4ef64;p=sysdb.git

diff --git a/src/core/store.c b/src/core/store.c
index 2522233..22e177c 100644
--- a/src/core/store.c
+++ b/src/core/store.c
@@ -26,7 +26,7 @@
  */
 
 #include "sysdb.h"
-#include "core/store.h"
+#include "core/store-private.h"
 #include "core/plugin.h"
 #include "utils/error.h"
 #include "utils/llist.h"
@@ -55,50 +55,6 @@ static pthread_rwlock_t obj_lock = PTHREAD_RWLOCK_INITIALIZER;
 static sdb_type_t sdb_store_obj_type;
 static sdb_type_t sdb_attribute_type;
 
-struct sdb_store_base {
-	sdb_object_t super;
-
-	/* object type */
-	int type;
-
-	/* common meta information */
-	sdb_time_t last_update;
-	sdb_store_base_t *parent;
-};
-#define STORE_BASE(obj) ((sdb_store_base_t *)(obj))
-#define STORE_CONST_BASE(obj) ((const sdb_store_base_t *)(obj))
-
-typedef struct {
-	sdb_store_base_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))
-
-typedef struct {
-	sdb_store_base_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))
-
-enum {
-	SDB_HOST = 1,
-	SDB_SERVICE,
-	SDB_ATTRIBUTE,
-};
-#define TYPE_TO_NAME(t) \
-	(((t) == SDB_HOST) ? "host" \
-		: ((t) == SDB_SERVICE) ? "service" \
-		: ((t) == SDB_ATTRIBUTE) ? "attribute" : "unknown")
-
-/* shortcuts for accessing the sdb_store_obj_t attributes
- * of inheriting objects */
-#define _last_update super.last_update
-
 static int
 store_base_init(sdb_object_t *obj, va_list ap)
 {
@@ -202,7 +158,7 @@ static sdb_type_t sdb_attribute_type = {
  */
 
 static sdb_store_obj_t *
-sdb_store_lookup_in_list(sdb_llist_t *l, int type, const char *name)
+store_lookup_in_list(sdb_llist_t *l, int type, const char *name)
 {
 	sdb_llist_iter_t *iter;
 
@@ -227,7 +183,7 @@ sdb_store_lookup_in_list(sdb_llist_t *l, int type, const char *name)
 		if ((type != SDB_HOST) && (STORE_BASE(sobj)->type == SDB_HOST))
 			continue;
 
-		sobj = sdb_store_lookup_in_list(sobj->children, type, name);
+		sobj = store_lookup_in_list(sobj->children, type, name);
 		if (sobj) {
 			sdb_llist_iter_destroy(iter);
 			return sobj;
@@ -235,13 +191,13 @@ sdb_store_lookup_in_list(sdb_llist_t *l, int type, const char *name)
 	}
 	sdb_llist_iter_destroy(iter);
 	return NULL;
-} /* sdb_store_lookup_in_list */
+} /* store_lookup_in_list */
 
 static sdb_store_obj_t *
-sdb_store_lookup(int type, const char *name)
+store_lookup(int type, const char *name)
 {
-	return sdb_store_lookup_in_list(obj_list, type, name);
-} /* sdb_store_lookup */
+	return store_lookup_in_list(obj_list, type, name);
+} /* store_lookup */
 
 /* The obj_lock has to be acquired before calling this function. */
 static int
@@ -295,7 +251,7 @@ store_obj(int parent_type, const char *parent_name,
 	if (parent_type && parent_name) {
 		sdb_store_obj_t *parent;
 
-		parent = sdb_store_lookup(parent_type, parent_name);
+		parent = store_lookup(parent_type, parent_name);
 		if (! parent) {
 			sdb_log(SDB_LOG_ERR, "store: Failed to store %s '%s' - "
 					"parent %s '%s' not found", TYPE_TO_NAME(type), name,
@@ -313,14 +269,14 @@ store_obj(int parent_type, const char *parent_name,
 
 	if (type == SDB_HOST)
 		/* make sure that each host is unique */
-		old = STORE_BASE(sdb_store_lookup_in_list(obj_list, type, name));
+		old = STORE_BASE(store_lookup_in_list(obj_list, type, name));
 	else if (type == SDB_ATTRIBUTE)
 		/* look into attributes of this host */
 		old = STORE_BASE(sdb_llist_search_by_name(parent_list, name));
 	else
-		/* look into services assigned to this host (sdb_store_lookup_in_list
+		/* look into services assigned to this host (store_lookup_in_list
 		 * does not look up services from hierarchical hosts) */
-		old = STORE_BASE(sdb_store_lookup_in_list(parent_list, type, name));
+		old = STORE_BASE(store_lookup_in_list(parent_list, type, name));
 
 	if (old) {
 		if (old->last_update > last_update) {
@@ -412,11 +368,15 @@ store_obj_tojson(sdb_llist_t *list, int type, sdb_strbuf_t *buf)
 		time_str[sizeof(time_str) - 1] = '\0';
 
 		sdb_strbuf_append(buf, "{\"name\": \"%s\", ", SDB_OBJ(sobj)->name);
-		if (type == SDB_ATTRIBUTE)
-			/* XXX: this needs to be type-dependent */
-			sdb_strbuf_append(buf, "\"value\": \"%s\", ",
-					SDB_ATTR(sobj)->value.data.string);
-		sdb_strbuf_append(buf, "\"last_update\": \"%s\"}", time_str);
+		if (type == SDB_ATTRIBUTE) {
+			char tmp[sdb_data_strlen(&SDB_ATTR(sobj)->value) + 1];
+			sdb_data_format(&SDB_ATTR(sobj)->value, tmp, sizeof(tmp),
+					SDB_DOUBLE_QUOTED);
+			sdb_strbuf_append(buf, "\"value\": %s, \"last_update\": \"%s\"}",
+					tmp, time_str);
+		}
+		else
+			sdb_strbuf_append(buf, "\"last_update\": \"%s\"}", time_str);
 
 		if (sdb_llist_iter_has_next(iter))
 			sdb_strbuf_append(buf, ",");
@@ -430,6 +390,13 @@ store_obj_tojson(sdb_llist_t *list, int type, sdb_strbuf_t *buf)
  * public API
  */
 
+void
+sdb_store_clear(void)
+{
+	sdb_llist_destroy(obj_list);
+	obj_list = NULL;
+} /* sdb_store_clear */
+
 int
 sdb_store_host(const char *name, sdb_time_t last_update)
 {
@@ -454,7 +421,7 @@ sdb_store_has_host(const char *name)
 	if (! name)
 		return NULL;
 
-	host = sdb_store_lookup(SDB_HOST, name);
+	host = store_lookup(SDB_HOST, name);
 	return host != NULL;
 } /* sdb_store_has_host */
 
@@ -466,7 +433,7 @@ sdb_store_get_host(const char *name)
 	if (! name)
 		return NULL;
 
-	host = sdb_store_lookup(SDB_HOST, name);
+	host = store_lookup(SDB_HOST, name);
 	if (! host)
 		return NULL;