![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/core/store.c b/src/core/store.c
index dba88cd2a03a70e126bf0b409e9d68b6b85e6b25..d195b8f0e3d029f4bf853910ba4ce05358e85d58 100644 (file)
--- a/src/core/store.c
+++ b/src/core/store.c
/*
* 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
#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>
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 {
+struct sdb_store_base {
sdb_object_t super;
sdb_time_t last_update;
- store_obj_t *parent;
+ sdb_store_base_t *parent;
};
-#define STORE_OBJ(obj) ((store_obj_t *)(obj))
-#define STORE_CONST_OBJ(obj) ((const store_obj_t *)(obj))
+#define STORE_BASE(obj) ((sdb_store_base_t *)(obj))
+#define STORE_CONST_BASE(obj) ((const sdb_store_base_t *)(obj))
typedef struct {
- store_obj_t super;
+ sdb_store_base_t super;
char *value;
} sdb_attribute_t;
#define SDB_CONST_ATTR(obj) ((const sdb_attribute_t *)(obj))
typedef struct {
- store_obj_t super;
+ sdb_store_base_t super;
int type;
sdb_llist_t *children;
#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);
+ sdb_store_base_t *sobj = STORE_BASE(obj);
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)
sdb_store_obj_t *sobj = SDB_STORE_OBJ(obj);
int ret;
- ret = store_obj_init(obj, ap);
+ ret = store_base_init(obj, ap);
if (ret)
return ret;
assert(obj);
- store_obj_destroy(obj);
+ store_base_destroy(obj);
if (sobj->children)
sdb_llist_destroy(sobj->children);
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;
int ret;
- ret = store_obj_init(obj, ap);
+ ret = store_base_init(obj, ap);
if (ret)
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 */
{
assert(obj);
- store_obj_destroy(obj);
+ store_base_destroy(obj);
if (SDB_ATTR(obj)->value)
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
};
/*
return sobj;
}
+ /* don't lookups non-host types from hierarchical hosts */
+ if ((type != SDB_HOST) && (sobj->type == SDB_HOST))
+ continue;
+
sobj = sdb_store_lookup_in_list(sobj->children, type, name);
if (sobj) {
sdb_llist_iter_destroy(iter);
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)
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(sdb_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 (sdb_store_lookup_in_list
+ * does not look up services from hierarchical hosts) */
+ old = STORE_BASE(sdb_store_lookup_in_list(parent_list, type, name));
if (old) {
if (old->last_update > last_update) {
*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,
+ new = STORE_BASE(sdb_object_create(name, sdb_attribute_type,
last_update, NULL));
else
- new = STORE_OBJ(sdb_object_create(name, sdb_store_obj_type,
+ new = STORE_BASE(sdb_object_create(name, sdb_store_obj_type,
last_update, type));
if (! new) {
{
int status;
- store_obj_t *updated_attr = NULL;
+ sdb_store_base_t *updated_attr = NULL;
if ((! hostname) || (! key))
return -1;
/* 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);
+ 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 */
/* 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);
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;
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);
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)) {
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 : */