X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fcore%2Fstore.c;h=47ba0356933453d4aa0c061daf23a6d3ad4a727c;hp=dba88cd2a03a70e126bf0b409e9d68b6b85e6b25;hb=39a45905e0b237e458b1826ff9b4fad1c4a59550;hpb=daee733bc490fdcfce179939009c1d957ae8bf00

diff --git a/src/core/store.c b/src/core/store.c
index dba88cd..47ba035 100644
--- a/src/core/store.c
+++ b/src/core/store.c
@@ -1,6 +1,6 @@
 /*
  * SysDB - src/core/store.c
- * Copyright (C) 2012 Sebastian 'tokkee' Harl <sh@tokkee.org>
+ * Copyright (C) 2012-2013 Sebastian 'tokkee' Harl <sh@tokkee.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25,10 +25,14 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_CONFIG_H
+#	include "config.h"
+#endif /* HAVE_CONFIG_H */
+
 #include "sysdb.h"
-#include "core/store.h"
-#include "core/error.h"
+#include "core/store-private.h"
 #include "core/plugin.h"
+#include "utils/error.h"
 #include "utils/llist.h"
 
 #include <assert.h>
@@ -55,92 +59,26 @@ 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 store_obj;
-typedef struct store_obj store_obj_t;
-
-struct store_obj {
-	sdb_object_t super;
-	sdb_time_t last_update;
-	store_obj_t *parent;
-};
-#define STORE_OBJ(obj) ((store_obj_t *)(obj))
-#define STORE_CONST_OBJ(obj) ((const store_obj_t *)(obj))
-
-typedef struct {
-	store_obj_t super;
-
-	char *value;
-} sdb_attribute_t;
-#define SDB_ATTR(obj) ((sdb_attribute_t *)(obj))
-#define SDB_CONST_ATTR(obj) ((const sdb_attribute_t *)(obj))
-
-typedef struct {
-	store_obj_t super;
-
-	int type;
-	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_obj_init(sdb_object_t *obj, va_list ap)
+store_base_init(sdb_object_t *obj, va_list ap)
 {
-	store_obj_t *sobj = STORE_OBJ(obj);
-	sobj->last_update = va_arg(ap, sdb_time_t);
+	sdb_store_base_t *sobj = STORE_BASE(obj);
+
+	sobj->type = va_arg(ap, int);
 
+	sobj->last_update = va_arg(ap, sdb_time_t);
 	sobj->parent = NULL;
 	return 0;
-} /* store_obj_init */
+} /* store_base_init */
 
 static void
-store_obj_destroy(sdb_object_t *obj)
+store_base_destroy(sdb_object_t *obj)
 {
-	const store_obj_t *sobj = STORE_OBJ(obj);
+	const sdb_store_base_t *sobj = STORE_CONST_BASE(obj);
 
 	if (sobj->parent)
 		sdb_object_deref(SDB_OBJ(sobj->parent));
-} /* store_obj_destroy */
-
-/* this may not be used as a type on its own but only as helper functions for
- * the derived types; the function accepts a variadic list of arguments to
- * pass to the sub-type's init function */
-static sdb_object_t *
-store_obj_clone(const sdb_object_t *obj, ...)
-{
-	const store_obj_t *sobj = STORE_CONST_OBJ(obj);
-	store_obj_t *new;
-
-	va_list ap;
-
-	va_start(ap, obj);
-
-	new = STORE_OBJ(sdb_object_vcreate(obj->name, obj->type, ap));
-	va_end(ap);
-	if (! new)
-		return NULL;
-
-	new->last_update = sobj->last_update;
-	sdb_object_ref(SDB_OBJ(sobj->parent));
-	new->parent = sobj->parent;
-	return SDB_OBJ(new);
-} /* store_obj_clone */
+} /* store_base_destroy */
 
 static int
 sdb_store_obj_init(sdb_object_t *obj, va_list ap)
@@ -148,12 +86,11 @@ sdb_store_obj_init(sdb_object_t *obj, va_list ap)
 	sdb_store_obj_t *sobj = SDB_STORE_OBJ(obj);
 	int ret;
 
-	ret = store_obj_init(obj, ap);
+	/* this will consume the first argument (type) of ap */
+	ret = store_base_init(obj, ap);
 	if (ret)
 		return ret;
 
-	sobj->type = va_arg(ap, int);
-
 	sobj->children = sdb_llist_create();
 	if (! sobj->children)
 		return -1;
@@ -170,7 +107,7 @@ sdb_store_obj_destroy(sdb_object_t *obj)
 
 	assert(obj);
 
-	store_obj_destroy(obj);
+	store_base_destroy(obj);
 
 	if (sobj->children)
 		sdb_llist_destroy(sobj->children);
@@ -178,50 +115,22 @@ sdb_store_obj_destroy(sdb_object_t *obj)
 		sdb_llist_destroy(sobj->attributes);
 } /* sdb_store_obj_destroy */
 
-static sdb_object_t *
-sdb_store_obj_clone(const sdb_object_t *obj)
-{
-	const sdb_store_obj_t *sobj = SDB_CONST_STORE_OBJ(obj);
-	sdb_store_obj_t *new;
-
-	new = SDB_STORE_OBJ(store_obj_clone(obj, sobj->_last_update, sobj->type));
-	if (! new)
-		return NULL;
-
-	if (sobj->children) {
-		sdb_llist_destroy(new->children);
-		new->children = sdb_llist_clone(sobj->children);
-		if (! new->children) {
-			sdb_object_deref(SDB_OBJ(new));
-			return NULL;
-		}
-	}
-	if (sobj->attributes) {
-		sdb_llist_destroy(new->attributes);
-		new->attributes = sdb_llist_clone(sobj->attributes);
-		if (! new->attributes) {
-			sdb_object_deref(SDB_OBJ(new));
-			return NULL;
-		}
-	}
-
-	return SDB_OBJ(new);
-} /* sdb_store_obj_clone */
-
 static int
 sdb_attr_init(sdb_object_t *obj, va_list ap)
 {
-	const char *value;
+	const sdb_data_t *value;
 	int ret;
 
-	ret = store_obj_init(obj, ap);
+	/* this will consume the first two arguments
+	 * (type and last_update) of ap */
+	ret = store_base_init(obj, ap);
 	if (ret)
 		return ret;
-	value = va_arg(ap, const char *);
+	value = va_arg(ap, const sdb_data_t *);
 
-	SDB_ATTR(obj)->value = strdup(value);
-	if (! SDB_ATTR(obj)->value)
-		return -1;
+	if (value)
+		if (sdb_data_copy(&SDB_ATTR(obj)->value, value))
+			return -1;
 	return 0;
 } /* sdb_attr_init */
 
@@ -230,38 +139,22 @@ sdb_attr_destroy(sdb_object_t *obj)
 {
 	assert(obj);
 
-	store_obj_destroy(obj);
-
-	if (SDB_ATTR(obj)->value)
-		free(SDB_ATTR(obj)->value);
+	store_base_destroy(obj);
+	sdb_data_free_datum(&SDB_ATTR(obj)->value);
 } /* sdb_attr_destroy */
 
-static sdb_object_t *
-sdb_attr_clone(const sdb_object_t *obj)
-{
-	const sdb_attribute_t *attr = (const sdb_attribute_t *)obj;
-	sdb_attribute_t *new;
-
-	new = SDB_ATTR(store_obj_clone(obj, attr->_last_update, attr->value));
-	if (! new)
-		return NULL;
-	return SDB_OBJ(new);
-} /* sdb_attr_clone */
-
 static sdb_type_t sdb_store_obj_type = {
 	sizeof(sdb_store_obj_t),
 
 	sdb_store_obj_init,
-	sdb_store_obj_destroy,
-	sdb_store_obj_clone
+	sdb_store_obj_destroy
 };
 
 static sdb_type_t sdb_attribute_type = {
 	sizeof(sdb_attribute_t),
 
 	sdb_attr_init,
-	sdb_attr_destroy,
-	sdb_attr_clone
+	sdb_attr_destroy
 };
 
 /*
@@ -269,7 +162,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;
 
@@ -284,13 +177,17 @@ sdb_store_lookup_in_list(sdb_llist_t *l, int type, const char *name)
 		sdb_store_obj_t *sobj = SDB_STORE_OBJ(sdb_llist_iter_get_next(iter));
 		assert(sobj);
 
-		if ((sobj->type == type)
+		if ((STORE_BASE(sobj)->type == type)
 				&& (! strcasecmp(SDB_OBJ(sobj)->name, name))) {
 			sdb_llist_iter_destroy(iter);
 			return sobj;
 		}
 
-		sobj = sdb_store_lookup_in_list(sobj->children, type, name);
+		/* don't lookups non-host types from hierarchical hosts */
+		if ((type != SDB_HOST) && (STORE_BASE(sobj)->type == SDB_HOST))
+			continue;
+
+		sobj = store_lookup_in_list(sobj->children, type, name);
 		if (sobj) {
 			sdb_llist_iter_destroy(iter);
 			return sobj;
@@ -298,24 +195,24 @@ 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
 store_obj(int parent_type, const char *parent_name,
 		int type, const char *name, sdb_time_t last_update,
-		store_obj_t **updated_obj)
+		sdb_store_base_t **updated_obj)
 {
 	char *parent_cname = NULL, *cname = NULL;
 
 	sdb_llist_t *parent_list;
-	store_obj_t *old;
+	sdb_store_base_t *old;
 	int status = 0;
 
 	if (last_update <= 0)
@@ -358,7 +255,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,
@@ -374,11 +271,16 @@ store_obj(int parent_type, const char *parent_name,
 			parent_list = parent->children;
 	}
 
-	/* TODO: only look into direct children? */
-	if (type == SDB_ATTRIBUTE)
-		old = STORE_OBJ(sdb_llist_search_by_name(parent_list, name));
+	if (type == SDB_HOST)
+		/* make sure that each host is unique */
+		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
-		old = STORE_OBJ(sdb_store_lookup_in_list(parent_list, type, name));
+		/* look into services assigned to this host (store_lookup_in_list
+		 * does not look up services from hierarchical hosts) */
+		old = STORE_BASE(store_lookup_in_list(parent_list, type, name));
 
 	if (old) {
 		if (old->last_update > last_update) {
@@ -397,15 +299,15 @@ store_obj(int parent_type, const char *parent_name,
 			*updated_obj = old;
 	}
 	else {
-		store_obj_t *new;
+		sdb_store_base_t *new;
 
 		if (type == SDB_ATTRIBUTE)
 			/* the value will be updated by the caller */
-			new = STORE_OBJ(sdb_object_create(name, sdb_attribute_type,
-						last_update, NULL));
+			new = STORE_BASE(sdb_object_create(name, sdb_attribute_type,
+						type, last_update, NULL));
 		else
-			new = STORE_OBJ(sdb_object_create(name, sdb_store_obj_type,
-						last_update, type));
+			new = STORE_BASE(sdb_object_create(name, sdb_store_obj_type,
+						type, last_update));
 
 		if (! new) {
 			char errbuf[1024];
@@ -431,12 +333,74 @@ store_obj(int parent_type, const char *parent_name,
 	free(parent_cname);
 	free(cname);
 	return status;
-} /* sdb_store_obj */
+} /* store_obj */
+
+/*
+ * store_obj_tojson serializes attribute / service objects to JSON.
+ *
+ * The function never returns an error. Rather, an error message will be part
+ * of the serialized data.
+ */
+static void
+store_obj_tojson(sdb_llist_t *list, int type, sdb_strbuf_t *buf)
+{
+	sdb_llist_iter_t *iter;
+	char time_str[64];
+
+	assert((type == SDB_ATTRIBUTE) || (type == SDB_SERVICE));
+
+	sdb_strbuf_append(buf, "[");
+
+	iter = sdb_llist_get_iter(list);
+	if (! iter) {
+		char errbuf[1024];
+		sdb_log(SDB_LOG_ERR, "store: Failed to retrieve %ss: %s\n",
+				TYPE_TO_NAME(type),
+				sdb_strerror(errno, errbuf, sizeof(errbuf)));
+		sdb_strbuf_append(buf, "{\"error\": \"failed to retrieve %ss: %s\"}",
+				TYPE_TO_NAME(type), errbuf);
+	}
+
+	/* has_next returns false if the iterator is NULL */
+	while (sdb_llist_iter_has_next(iter)) {
+		sdb_store_base_t *sobj = STORE_BASE(sdb_llist_iter_get_next(iter));
+		assert(sobj);
+
+		if (! sdb_strftime(time_str, sizeof(time_str),
+					"%F %T %z", sobj->last_update))
+			snprintf(time_str, sizeof(time_str), "<error>");
+		time_str[sizeof(time_str) - 1] = '\0';
+
+		sdb_strbuf_append(buf, "{\"name\": \"%s\", ", SDB_OBJ(sobj)->name);
+		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, ",");
+	}
+
+	sdb_llist_iter_destroy(iter);
+	sdb_strbuf_append(buf, "]");
+} /* store_obj_tojson */
 
 /*
  * 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)
 {
@@ -461,17 +425,34 @@ 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 */
 
+sdb_store_base_t *
+sdb_store_get_host(const char *name)
+{
+	sdb_store_obj_t *host;
+
+	if (! name)
+		return NULL;
+
+	host = store_lookup(SDB_HOST, name);
+	if (! host)
+		return NULL;
+
+	sdb_object_ref(SDB_OBJ(host));
+	return STORE_BASE(host);
+} /* sdb_store_get_host */
+
 int
-sdb_store_attribute(const char *hostname, const char *key, const char *value,
+sdb_store_attribute(const char *hostname,
+		const char *key, const sdb_data_t *value,
 		sdb_time_t last_update)
 {
 	int status;
 
-	store_obj_t *updated_attr = NULL;
+	sdb_store_base_t *updated_attr = NULL;
 
 	if ((! hostname) || (! key))
 		return -1;
@@ -481,11 +462,14 @@ sdb_store_attribute(const char *hostname, const char *key, const char *value,
 			/* stored object = */ SDB_ATTRIBUTE, key, last_update,
 			&updated_attr);
 
-	SDB_ATTR(updated_attr)->value = strdup(value);
-	if (! SDB_ATTR(updated_attr)->value) {
-		sdb_object_deref(SDB_OBJ(updated_attr));
-		status = -1;
+	if (status >= 0) {
+		assert(updated_attr);
+		if (sdb_data_copy(&SDB_ATTR(updated_attr)->value, value)) {
+			sdb_object_deref(SDB_OBJ(updated_attr));
+			status = -1;
+		}
 	}
+
 	pthread_rwlock_unlock(&obj_lock);
 	return status;
 } /* sdb_store_attribute */
@@ -507,13 +491,47 @@ sdb_store_service(const char *hostname, const char *name,
 	return status;
 } /* sdb_store_service */
 
+int
+sdb_store_host_tojson(sdb_store_base_t *h, sdb_strbuf_t *buf, int flags)
+{
+	sdb_store_obj_t *host;
+	char time_str[64];
+
+	if ((! h) || (h->type != SDB_HOST) || (! buf))
+		return -1;
+
+	host = SDB_STORE_OBJ(h);
+
+	if (! sdb_strftime(time_str, sizeof(time_str),
+				"%F %T %z", host->_last_update))
+		snprintf(time_str, sizeof(time_str), "<error>");
+	time_str[sizeof(time_str) - 1] = '\0';
+
+	sdb_strbuf_append(buf, "{\"name\": \"%s\", "
+			"\"last_update\": \"%s\"",
+			SDB_OBJ(host)->name, time_str);
+
+	if (! (flags & SDB_SKIP_ATTRIBUTES)) {
+		sdb_strbuf_append(buf, ", \"attributes\": ");
+		store_obj_tojson(host->attributes, SDB_ATTRIBUTE, buf);
+	}
+
+	if (! (flags & SDB_SKIP_SERVICES)) {
+		sdb_strbuf_append(buf, ", \"services\": ");
+		store_obj_tojson(host->children, SDB_SERVICE, buf);
+	}
+
+	sdb_strbuf_append(buf, "}");
+	return 0;
+} /* sdb_store_host_tojson */
+
 /* TODO: actually support hierarchical data */
 int
-sdb_store_dump(FILE *fh)
+sdb_store_tojson(sdb_strbuf_t *buf, int flags)
 {
 	sdb_llist_iter_t *host_iter;
 
-	if (! fh)
+	if (! buf)
 		return -1;
 
 	pthread_rwlock_rdlock(&obj_lock);
@@ -524,74 +542,25 @@ sdb_store_dump(FILE *fh)
 		return -1;
 	}
 
-	while (sdb_llist_iter_has_next(host_iter)) {
-		sdb_store_obj_t *host = SDB_STORE_OBJ(sdb_llist_iter_get_next(host_iter));
-		sdb_llist_iter_t *svc_iter;
-		sdb_llist_iter_t *attr_iter;
-
-		char time_str[64];
+	sdb_strbuf_append(buf, "{\"hosts\":[");
 
+	while (sdb_llist_iter_has_next(host_iter)) {
+		sdb_store_base_t *host = STORE_BASE(sdb_llist_iter_get_next(host_iter));
 		assert(host);
 
-		if (! sdb_strftime(time_str, sizeof(time_str),
-					"%F %T %z", host->_last_update))
-			snprintf(time_str, sizeof(time_str), "<error>");
-		time_str[sizeof(time_str) - 1] = '\0';
-
-		fprintf(fh, "Host '%s' (last updated: %s):\n",
-				SDB_OBJ(host)->name, time_str);
-
-		attr_iter = sdb_llist_get_iter(host->attributes);
-		if (! attr_iter) {
-			char errbuf[1024];
-			fprintf(fh, "Failed to retrieve attributes: %s\n",
-					sdb_strerror(errno, errbuf, sizeof(errbuf)));
-			continue;
-		}
-
-		while (sdb_llist_iter_has_next(attr_iter)) {
-			sdb_attribute_t *attr = SDB_ATTR(sdb_llist_iter_get_next(attr_iter));
-			assert(attr);
-
-			if (! sdb_strftime(time_str, sizeof(time_str),
-						"%F %T %z", attr->_last_update))
-				snprintf(time_str, sizeof(time_str), "<error>");
-			time_str[sizeof(time_str) - 1] = '\0';
-
-			fprintf(fh, "\tAttribute '%s' -> '%s' (last updated: %s)\n",
-					SDB_OBJ(attr)->name, attr->value, time_str);
-		}
-
-		sdb_llist_iter_destroy(attr_iter);
-
-		svc_iter = sdb_llist_get_iter(host->children);
-		if (! svc_iter) {
-			char errbuf[1024];
-			fprintf(fh, "Failed to retrieve services: %s\n",
-					sdb_strerror(errno, errbuf, sizeof(errbuf)));
-			continue;
-		}
-
-		while (sdb_llist_iter_has_next(svc_iter)) {
-			sdb_store_obj_t *svc = SDB_STORE_OBJ(sdb_llist_iter_get_next(svc_iter));
-			assert(svc);
-
-			if (! sdb_strftime(time_str, sizeof(time_str),
-						"%F %T %z", svc->_last_update))
-				snprintf(time_str, sizeof(time_str), "<error>");
-			time_str[sizeof(time_str) - 1] = '\0';
-
-			fprintf(fh, "\tService '%s' (last updated: %s)\n",
-					SDB_OBJ(svc)->name, time_str);
-		}
+		if (sdb_store_host_tojson(host, buf, flags))
+			return -1;
 
-		sdb_llist_iter_destroy(svc_iter);
+		if (sdb_llist_iter_has_next(host_iter))
+			sdb_strbuf_append(buf, ",");
 	}
 
+	sdb_strbuf_append(buf, "]}");
+
 	sdb_llist_iter_destroy(host_iter);
 	pthread_rwlock_unlock(&obj_lock);
 	return 0;
-} /* sdb_store_dump */
+} /* sdb_store_tojson */
 
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */