X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fcore%2Fstore.c;h=e9e0979e72e4db10ec99d34f2596f178c5d19317;hp=5a3cc4c357b70b429cdb0203711185a909c3eb36;hb=ddb7ffc175e49abfa69c82777b88d73e1f1103fb;hpb=c17fda2b04ec2ea5875e637f7efba2022cbe8b62

diff --git a/src/core/store.c b/src/core/store.c
index 5a3cc4c..e9e0979 100644
--- a/src/core/store.c
+++ b/src/core/store.c
@@ -27,8 +27,8 @@
 
 #include "sysdb.h"
 #include "core/store.h"
-#include "core/error.h"
 #include "core/plugin.h"
+#include "utils/error.h"
 #include "utils/llist.h"
 
 #include <assert.h>
@@ -118,30 +118,6 @@ store_obj_destroy(sdb_object_t *obj)
 		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 */
-
 static int
 sdb_store_obj_init(sdb_object_t *obj, va_list ap)
 {
@@ -178,36 +154,6 @@ 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)
 {
@@ -219,9 +165,11 @@ sdb_attr_init(sdb_object_t *obj, va_list ap)
 		return ret;
 	value = va_arg(ap, const char *);
 
-	SDB_ATTR(obj)->value = strdup(value);
-	if (! SDB_ATTR(obj)->value)
-		return -1;
+	if (value) {
+		SDB_ATTR(obj)->value = strdup(value);
+		if (! SDB_ATTR(obj)->value)
+			return -1;
+	}
 	return 0;
 } /* sdb_attr_init */
 
@@ -236,32 +184,18 @@ sdb_attr_destroy(sdb_object_t *obj)
 		free(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
 };
 
 /*
@@ -306,18 +240,18 @@ sdb_store_lookup(int type, const char *name)
 	return sdb_store_lookup_in_list(obj_list, type, name);
 } /* sdb_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)
 {
+	char *parent_cname = NULL, *cname = NULL;
+
 	sdb_llist_t *parent_list;
 	store_obj_t *old;
 	int status = 0;
 
-	if (! name)
-		return -1;
-
 	if (last_update <= 0)
 		last_update = sdb_gettime();
 
@@ -329,11 +263,27 @@ store_obj(int parent_type, const char *parent_name,
 			|| (type == SDB_SERVICE)
 			|| (type == SDB_ATTRIBUTE));
 
-	pthread_rwlock_wrlock(&obj_lock);
+	if (parent_type == SDB_HOST) {
+		parent_cname = sdb_plugin_cname(strdup(parent_name));
+		if (! parent_cname) {
+			sdb_log(SDB_LOG_ERR, "store: strdup failed");
+			return -1;
+		}
+		parent_name = parent_cname;
+	}
+	if (type == SDB_HOST) {
+		cname = sdb_plugin_cname(strdup(name));
+		if (! cname) {
+			sdb_log(SDB_LOG_ERR, "store: strdup failed");
+			return -1;
+		}
+		name = cname;
+	}
 
 	if (! obj_list) {
 		if (! (obj_list = sdb_llist_create())) {
-			pthread_rwlock_unlock(&obj_lock);
+			free(parent_cname);
+			free(cname);
 			return -1;
 		}
 	}
@@ -347,7 +297,8 @@ store_obj(int parent_type, const char *parent_name,
 			sdb_log(SDB_LOG_ERR, "store: Failed to store %s '%s' - "
 					"parent %s '%s' not found", TYPE_TO_NAME(type), name,
 					TYPE_TO_NAME(parent_type), parent_name);
-			pthread_rwlock_unlock(&obj_lock);
+			free(parent_cname);
+			free(cname);
 			return -1;
 		}
 
@@ -358,7 +309,10 @@ store_obj(int parent_type, const char *parent_name,
 	}
 
 	/* TODO: only look into direct children? */
-	if (type == SDB_ATTRIBUTE)
+	if (type == SDB_HOST)
+		/* make sure that each host is unique */
+		old = STORE_OBJ(sdb_store_lookup_in_list(obj_list, type, name));
+	else if (type == SDB_ATTRIBUTE)
 		old = STORE_OBJ(sdb_llist_search_by_name(parent_list, name));
 	else
 		old = STORE_OBJ(sdb_store_lookup_in_list(parent_list, type, name));
@@ -395,7 +349,8 @@ store_obj(int parent_type, const char *parent_name,
 			sdb_log(SDB_LOG_ERR, "store: Failed to create %s '%s': %s",
 					TYPE_TO_NAME(type), name,
 					sdb_strerror(errno, errbuf, sizeof(errbuf)));
-			pthread_rwlock_unlock(&obj_lock);
+			free(parent_cname);
+			free(cname);
 			return -1;
 		}
 
@@ -410,8 +365,8 @@ store_obj(int parent_type, const char *parent_name,
 		if (updated_obj)
 			*updated_obj = new;
 	}
-
-	pthread_rwlock_unlock(&obj_lock);
+	free(parent_cname);
+	free(cname);
 	return status;
 } /* sdb_store_obj */
 
@@ -422,22 +377,16 @@ store_obj(int parent_type, const char *parent_name,
 int
 sdb_store_host(const char *name, sdb_time_t last_update)
 {
-	char *cname;
 	int status;
 
 	if (! name)
 		return -1;
 
-	cname = sdb_plugin_cname(strdup(name));
-	if (! cname) {
-		sdb_log(SDB_LOG_ERR, "store: strdup failed");
-		return -1;
-	}
-
+	pthread_rwlock_wrlock(&obj_lock);
 	status = store_obj(/* parent = */ 0, NULL,
-			/* stored object = */ SDB_HOST, cname, last_update,
+			/* stored object = */ SDB_HOST, name, last_update,
 			/* updated_obj = */ NULL);
-	free(cname);
+	pthread_rwlock_unlock(&obj_lock);
 	return status;
 } /* sdb_store_host */
 
@@ -457,7 +406,6 @@ int
 sdb_store_attribute(const char *hostname, const char *key, const char *value,
 		sdb_time_t last_update)
 {
-	char *cname;
 	int status;
 
 	store_obj_t *updated_attr = NULL;
@@ -465,22 +413,21 @@ sdb_store_attribute(const char *hostname, const char *key, const char *value,
 	if ((! hostname) || (! key))
 		return -1;
 
-	cname = sdb_plugin_cname(strdup(hostname));
-	if (! cname) {
-		sdb_log(SDB_LOG_ERR, "store: strdup failed");
-		return -1;
-	}
-
-	status = store_obj(/* parent = */ SDB_HOST, cname,
+	pthread_rwlock_wrlock(&obj_lock);
+	status = store_obj(/* parent = */ SDB_HOST, hostname,
 			/* stored object = */ SDB_ATTRIBUTE, key, last_update,
 			&updated_attr);
-	free(cname);
 
-	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);
+		SDB_ATTR(updated_attr)->value = strdup(value);
+		if (! SDB_ATTR(updated_attr)->value) {
+			sdb_object_deref(SDB_OBJ(updated_attr));
+			status = -1;
+		}
 	}
+
+	pthread_rwlock_unlock(&obj_lock);
 	return status;
 } /* sdb_store_attribute */
 
@@ -488,32 +435,26 @@ int
 sdb_store_service(const char *hostname, const char *name,
 		sdb_time_t last_update)
 {
-	char *cname;
 	int status;
 
 	if ((! hostname) || (! name))
 		return -1;
 
-	cname = sdb_plugin_cname(strdup(hostname));
-	if (! cname) {
-		sdb_log(SDB_LOG_ERR, "store: strdup failed");
-		return -1;
-	}
-
-	status = store_obj(/* parent = */ SDB_HOST, cname,
+	pthread_rwlock_wrlock(&obj_lock);
+	status = store_obj(/* parent = */ SDB_HOST, hostname,
 			/* stored object = */ SDB_SERVICE, name, last_update,
 			/* updated obj = */ NULL);
-	free(cname);
+	pthread_rwlock_unlock(&obj_lock);
 	return status;
 } /* sdb_store_service */
 
 /* TODO: actually support hierarchical data */
 int
-sdb_store_dump(FILE *fh)
+sdb_store_tojson(sdb_strbuf_t *buf)
 {
 	sdb_llist_iter_t *host_iter;
 
-	if (! fh)
+	if (! buf)
 		return -1;
 
 	pthread_rwlock_rdlock(&obj_lock);
@@ -524,6 +465,8 @@ sdb_store_dump(FILE *fh)
 		return -1;
 	}
 
+	sdb_strbuf_append(buf, "{\"hosts\":[");
+
 	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;
@@ -538,17 +481,21 @@ sdb_store_dump(FILE *fh)
 			snprintf(time_str, sizeof(time_str), "<error>");
 		time_str[sizeof(time_str) - 1] = '\0';
 
-		fprintf(fh, "Host '%s' (last updated: %s):\n",
+		sdb_strbuf_append(buf, "{\"name\": \"%s\", "
+				"\"last_update\": \"%s\", "
+				"\"attributes\": [",
 				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_log(SDB_LOG_ERR, "store: Failed to retrieve attributes: %s\n",
 					sdb_strerror(errno, errbuf, sizeof(errbuf)));
-			continue;
+			sdb_strbuf_append(buf, "{\"error\": \"failed to retrieve "
+					"attributes: %s\"}", errbuf);
 		}
 
+		/* has_next returns false if the iterator is NULL */
 		while (sdb_llist_iter_has_next(attr_iter)) {
 			sdb_attribute_t *attr = SDB_ATTR(sdb_llist_iter_get_next(attr_iter));
 			assert(attr);
@@ -558,18 +505,21 @@ sdb_store_dump(FILE *fh)
 				snprintf(time_str, sizeof(time_str), "<error>");
 			time_str[sizeof(time_str) - 1] = '\0';
 
-			fprintf(fh, "\tAttribute '%s' -> '%s' (last updated: %s)\n",
+			sdb_strbuf_append(buf, "{\"name\": \"%s\", "
+					"\"value\": \"%s\", \"last_update\": \"%s\"},",
 					SDB_OBJ(attr)->name, attr->value, time_str);
 		}
 
 		sdb_llist_iter_destroy(attr_iter);
+		sdb_strbuf_append(buf, "], \"services\": [");
 
 		svc_iter = sdb_llist_get_iter(host->children);
 		if (! svc_iter) {
 			char errbuf[1024];
-			fprintf(fh, "Failed to retrieve services: %s\n",
+			sdb_log(SDB_LOG_ERR, "store: Failed to retrieve services: %s\n",
 					sdb_strerror(errno, errbuf, sizeof(errbuf)));
-			continue;
+			sdb_strbuf_append(buf, "{\"error\": \"failed to retrieve "
+					"services: %s\"}", errbuf);
 		}
 
 		while (sdb_llist_iter_has_next(svc_iter)) {
@@ -581,17 +531,21 @@ sdb_store_dump(FILE *fh)
 				snprintf(time_str, sizeof(time_str), "<error>");
 			time_str[sizeof(time_str) - 1] = '\0';
 
-			fprintf(fh, "\tService '%s' (last updated: %s)\n",
+			sdb_strbuf_append(buf, "{\"name\": \"%s\", "
+					"\"last_update\": \"%s\"},",
 					SDB_OBJ(svc)->name, time_str);
 		}
 
 		sdb_llist_iter_destroy(svc_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 : */