![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/core/store.c b/src/core/store.c
index 791a7602cbdd732266fee3105bc96c46941763b0..5a3cc4c357b70b429cdb0203711185a909c3eb36 100644 (file)
--- a/src/core/store.c
+++ b/src/core/store.c
enum {
SDB_HOST = 1,
SDB_SERVICE,
+ SDB_ATTRIBUTE,
};
#define TYPE_TO_NAME(t) \
(((t) == SDB_HOST) ? "host" \
- : ((t) == SDB_SERVICE) ? "service" : "unknown")
+ : ((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 __attribute__((unused)) ap)
+store_obj_init(sdb_object_t *obj, va_list ap)
{
store_obj_t *sobj = STORE_OBJ(obj);
- sobj->last_update = sdb_gettime();
- /* ignore errors -> last_update will be updated later */
+ sobj->last_update = va_arg(ap, sdb_time_t);
sobj->parent = NULL;
return 0;
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->type));
+ new = SDB_STORE_OBJ(store_obj_clone(obj, sobj->_last_update, sobj->type));
if (! new)
return NULL;
- new->type = sobj->type;
-
- /* make sure these are initialized; else sdb_object_deref() might access
- * arbitrary memory in case of an error */
- new->children = new->attributes = 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));
}
}
if (sobj->attributes) {
+ sdb_llist_destroy(new->attributes);
new->attributes = sdb_llist_clone(sobj->attributes);
if (! new->attributes) {
sdb_object_deref(SDB_OBJ(new));
}
}
- new->_last_update = sobj->_last_update;
return SDB_OBJ(new);
} /* sdb_store_obj_clone */
static int
sdb_attr_init(sdb_object_t *obj, va_list ap)
{
- const char *value = va_arg(ap, const char *);
+ const char *value;
int ret;
ret = store_obj_init(obj, ap);
if (ret)
return ret;
+ value = va_arg(ap, const char *);
SDB_ATTR(obj)->value = strdup(value);
if (! SDB_ATTR(obj)->value)
const sdb_attribute_t *attr = (const sdb_attribute_t *)obj;
sdb_attribute_t *new;
- new = SDB_ATTR(store_obj_clone(obj, attr->value));
+ new = SDB_ATTR(store_obj_clone(obj, attr->_last_update, attr->value));
if (! new)
return NULL;
return SDB_OBJ(new);
static int
store_obj(int parent_type, const char *parent_name,
- int type, const char *name, sdb_time_t last_update)
+ int type, const char *name, sdb_time_t last_update,
+ store_obj_t **updated_obj)
{
sdb_llist_t *parent_list;
store_obj_t *old;
last_update = sdb_gettime();
assert((parent_type == 0)
- || (parent_type = SDB_HOST)
+ || (parent_type == SDB_HOST)
|| (parent_type == SDB_SERVICE));
- assert((type == 0) || (type = SDB_HOST) || (type == SDB_SERVICE));
+ assert((type == 0)
+ || (type == SDB_HOST)
+ || (type == SDB_SERVICE)
+ || (type == SDB_ATTRIBUTE));
pthread_rwlock_wrlock(&obj_lock);
return -1;
}
- parent_list = parent->children;
+ if (type == SDB_ATTRIBUTE)
+ parent_list = parent->attributes;
+ else
+ parent_list = parent->children;
}
/* TODO: only look into direct children? */
- old = STORE_OBJ(sdb_store_lookup_in_list(parent_list, type, name));
+ 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));
if (old) {
if (old->last_update > last_update) {
else {
old->last_update = last_update;
}
+
+ if (updated_obj)
+ *updated_obj = old;
}
else {
- store_obj_t *new = STORE_OBJ(sdb_object_create(name,
- sdb_store_obj_type, type));
+ store_obj_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));
+ else
+ new = STORE_OBJ(sdb_object_create(name, sdb_store_obj_type,
+ last_update, type));
+
if (! new) {
char errbuf[1024];
sdb_log(SDB_LOG_ERR, "store: Failed to create %s '%s': %s",
return -1;
}
- /* TODO: insert type-aware */
+ /* TODO: insert type-aware; the current version works as long as we
+ * don't support to store hierarchical data */
status = sdb_llist_insert_sorted(parent_list, SDB_OBJ(new),
sdb_object_cmp_by_name);
/* pass control to the list or destroy in case of an error */
sdb_object_deref(SDB_OBJ(new));
+
+ if (updated_obj)
+ *updated_obj = new;
}
pthread_rwlock_unlock(&obj_lock);
sdb_store_host(const char *name, sdb_time_t last_update)
{
char *cname;
- int status = 0;
+ int status;
if (! name)
return -1;
}
status = store_obj(/* parent = */ 0, NULL,
- /* stored object = */ SDB_HOST, cname, last_update);
+ /* stored object = */ SDB_HOST, cname, last_update,
+ /* updated_obj = */ NULL);
free(cname);
return status;
} /* sdb_store_host */
sdb_store_attribute(const char *hostname, const char *key, const char *value,
sdb_time_t last_update)
{
- sdb_store_obj_t *sobj;
- sdb_attribute_t *old;
+ char *cname;
+ int status;
- int status = 0;
+ store_obj_t *updated_attr = NULL;
if ((! hostname) || (! key))
return -1;
- if (last_update <= 0)
- last_update = sdb_gettime();
-
- if (! obj_list)
- return -1;
-
- pthread_rwlock_wrlock(&obj_lock);
-
- sobj = sdb_store_lookup(SDB_HOST, hostname);
- if (! sobj) {
- pthread_rwlock_unlock(&obj_lock);
+ cname = sdb_plugin_cname(strdup(hostname));
+ if (! cname) {
+ sdb_log(SDB_LOG_ERR, "store: strdup failed");
return -1;
}
- old = SDB_ATTR(sdb_llist_search_by_name(sobj->attributes, key));
- if (old) {
- if (old->_last_update > last_update) {
- sdb_log(SDB_LOG_DEBUG, "store: Cannot update attribute "
- "'%s/%s' - value too old (%"PRIscTIME" < %"PRIscTIME")",
- hostname, key, last_update, old->_last_update);
- status = 1;
- }
- else {
- old->_last_update = last_update;
- }
- }
- else {
- sdb_attribute_t *new = SDB_ATTR(sdb_object_create(key,
- sdb_attribute_type, value));
- if (! new) {
- char errbuf[1024];
- sdb_log(SDB_LOG_ERR, "store: Failed to clone attribute "
- "object: %s", sdb_strerror(errno, errbuf, sizeof(errbuf)));
- pthread_rwlock_unlock(&obj_lock);
- return -1;
- }
-
- status = sdb_llist_insert_sorted(sobj->attributes, SDB_OBJ(new),
- sdb_object_cmp_by_name);
+ status = store_obj(/* parent = */ SDB_HOST, cname,
+ /* stored object = */ SDB_ATTRIBUTE, key, last_update,
+ &updated_attr);
+ free(cname);
- /* pass control to the list or destroy in case of an error */
- sdb_object_deref(SDB_OBJ(new));
+ 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 */
sdb_time_t last_update)
{
char *cname;
- int status = 0;
+ int status;
if ((! hostname) || (! name))
return -1;
}
status = store_obj(/* parent = */ SDB_HOST, cname,
- /* stored object = */ SDB_SERVICE, name, last_update);
+ /* stored object = */ SDB_SERVICE, name, last_update,
+ /* updated obj = */ NULL);
free(cname);
return status;
} /* sdb_store_service */