![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/core/store.c b/src/core/store.c
index ccb5f0a954d97e0f867bc2bb2067573245e30133..df5105794ad8f2827323dd81f239f0cdddd818a5 100644 (file)
--- a/src/core/store.c
+++ b/src/core/store.c
*/
static sdb_llist_t *host_list = NULL;
-static pthread_rwlock_t obj_lock = PTHREAD_RWLOCK_INITIALIZER;
+static pthread_rwlock_t host_lock = PTHREAD_RWLOCK_INITIALIZER;
/*
* private types
static sdb_type_t sdb_attribute_type;
static int
-store_base_init(sdb_object_t *obj, va_list ap)
+store_obj_init(sdb_object_t *obj, va_list ap)
{
- sdb_store_base_t *sobj = STORE_BASE(obj);
+ sdb_store_obj_t *sobj = STORE_OBJ(obj);
sobj->type = va_arg(ap, int);
sobj->interval = 0;
sobj->parent = NULL;
return 0;
-} /* store_base_init */
+} /* store_obj_init */
static void
-store_base_destroy(sdb_object_t *obj)
+store_obj_destroy(sdb_object_t *obj)
{
- const sdb_store_base_t *sobj = STORE_CONST_BASE(obj);
+ const sdb_store_obj_t *sobj = STORE_CONST_OBJ(obj);
if (sobj->parent)
sdb_object_deref(SDB_OBJ(sobj->parent));
-} /* store_base_destroy */
+} /* store_obj_destroy */
static int
sdb_host_init(sdb_object_t *obj, va_list ap)
int ret;
/* this will consume the first argument (type) of ap */
- ret = store_base_init(obj, ap);
+ ret = store_obj_init(obj, ap);
if (ret)
return ret;
sdb_host_t *sobj = HOST(obj);
assert(obj);
- store_base_destroy(obj);
+ store_obj_destroy(obj);
if (sobj->services)
sdb_llist_destroy(sobj->services);
int ret;
/* this will consume the first argument (type) of ap */
- ret = store_base_init(obj, ap);
+ ret = store_obj_init(obj, ap);
if (ret)
return ret;
sdb_service_t *sobj = SVC(obj);
assert(obj);
- store_base_destroy(obj);
+ store_obj_destroy(obj);
if (sobj->attributes)
sdb_llist_destroy(sobj->attributes);
/* this will consume the first two arguments
* (type and last_update) of ap */
- ret = store_base_init(obj, ap);
+ ret = store_obj_init(obj, ap);
if (ret)
return ret;
value = va_arg(ap, const sdb_data_t *);
{
assert(obj);
- store_base_destroy(obj);
+ store_obj_destroy(obj);
sdb_data_free_datum(&ATTR(obj)->value);
} /* sdb_attr_destroy */
return HOST(sdb_llist_search_by_name(host_list, name));
} /* lookup_host */
-/* The obj_lock has to be acquired before calling this function. */
+/* The host_lock has to be acquired before calling this function. */
static int
store_obj(const char *hostname, int type, const char *name,
- sdb_time_t last_update, sdb_store_base_t **updated_obj)
+ sdb_time_t last_update, sdb_store_obj_t **updated_obj)
{
char *host_cname = NULL, *cname = NULL;
sdb_llist_t *parent_list;
- sdb_store_base_t *old;
+ sdb_store_obj_t *old;
int status = 0;
if (last_update <= 0)
}
if (type == SDB_HOST)
- old = STORE_BASE(sdb_llist_search_by_name(host_list, name));
+ old = STORE_OBJ(sdb_llist_search_by_name(host_list, name));
else
- old = STORE_BASE(sdb_llist_search_by_name(parent_list, name));
+ old = STORE_OBJ(sdb_llist_search_by_name(parent_list, name));
if (old) {
if (old->last_update > last_update) {
*updated_obj = old;
}
else {
- sdb_store_base_t *new;
+ sdb_store_obj_t *new;
if (type == SDB_ATTRIBUTE) {
/* the value will be updated by the caller */
- new = STORE_BASE(sdb_object_create(name, sdb_attribute_type,
+ new = STORE_OBJ(sdb_object_create(name, sdb_attribute_type,
type, last_update, NULL));
}
else {
sdb_type_t t;
t = type == SDB_HOST ? sdb_host_type : sdb_service_type;
- new = STORE_BASE(sdb_object_create(name, t, type, last_update));
+ new = STORE_OBJ(sdb_object_create(name, t, type, last_update));
}
if (! new) {
return status;
} /* store_obj */
+/*
+ * store_common_tojson serializes common object attributes to JSON.
+ *
+ * The function never returns an error. Rather, an error message will be part
+ * of the serialized data.
+ */
+static void
+store_common_tojson(sdb_store_obj_t *obj, sdb_strbuf_t *buf)
+{
+ char time_str[64];
+ char interval_str[64];
+
+ if (! sdb_strftime(time_str, sizeof(time_str),
+ "%F %T %z", obj->last_update))
+ snprintf(time_str, sizeof(time_str), "<error>");
+ time_str[sizeof(time_str) - 1] = '\0';
+
+ if (! sdb_strfinterval(interval_str, sizeof(interval_str),
+ obj->interval))
+ snprintf(interval_str, sizeof(interval_str), "<error>");
+ interval_str[sizeof(interval_str) - 1] = '\0';
+
+ sdb_strbuf_append(buf, "\"last_update\": \"%s\", "
+ "\"update_interval\": \"%s\"", time_str, interval_str);
+} /* store_common_tojson */
+
/*
* store_obj_tojson serializes attribute / service objects to JSON.
*
store_obj_tojson(sdb_llist_t *list, int type, sdb_strbuf_t *buf)
{
sdb_llist_iter_t *iter;
- char time_str[64];
- char interval_str[64];
assert((type == SDB_ATTRIBUTE) || (type == SDB_SERVICE));
sdb_strbuf_append(buf, "[");
-
iter = sdb_llist_get_iter(list);
if (! iter) {
char errbuf[1024];
/* 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));
+ sdb_store_obj_t *sobj = STORE_OBJ(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';
-
- if (! sdb_strfinterval(interval_str, sizeof(interval_str),
- sobj->interval))
- snprintf(interval_str, sizeof(interval_str), "<error>");
- interval_str[sizeof(interval_str) - 1] = '\0';
+ assert(sobj->type == type);
sdb_strbuf_append(buf, "{\"name\": \"%s\", ", SDB_OBJ(sobj)->name);
- if (type == SDB_ATTRIBUTE) {
+ if (sobj->type == SDB_ATTRIBUTE) {
char tmp[sdb_data_strlen(&ATTR(sobj)->value) + 1];
sdb_data_format(&ATTR(sobj)->value, tmp, sizeof(tmp),
SDB_DOUBLE_QUOTED);
- sdb_strbuf_append(buf, "\"value\": %s, \"last_update\": \"%s\", "
- "\"update_interval\": \"%s\"}", tmp, time_str,
- interval_str);
+ sdb_strbuf_append(buf, "\"value\": %s, ", tmp);
}
- else
- sdb_strbuf_append(buf, "\"last_update\": \"%s\", "
- "\"update_interval\": \"%s\"}", time_str, interval_str);
+
+ store_common_tojson(sobj, buf);
+ sdb_strbuf_append(buf, "}");
if (sdb_llist_iter_has_next(iter))
sdb_strbuf_append(buf, ",");
if (! name)
return -1;
- pthread_rwlock_wrlock(&obj_lock);
+ pthread_rwlock_wrlock(&host_lock);
status = store_obj(/* hostname = */ NULL,
/* stored object = */ SDB_HOST, name, last_update,
/* updated_obj = */ NULL);
- pthread_rwlock_unlock(&obj_lock);
+ pthread_rwlock_unlock(&host_lock);
return status;
} /* sdb_store_host */
return host != NULL;
} /* sdb_store_has_host */
-sdb_store_base_t *
+sdb_store_obj_t *
sdb_store_get_host(const char *name)
{
sdb_host_t *host;
return NULL;
sdb_object_ref(SDB_OBJ(host));
- return STORE_BASE(host);
+ return STORE_OBJ(host);
} /* sdb_store_get_host */
int
{
int status;
- sdb_store_base_t *updated_attr = NULL;
+ sdb_store_obj_t *updated_attr = NULL;
if ((! hostname) || (! key))
return -1;
- pthread_rwlock_wrlock(&obj_lock);
+ pthread_rwlock_wrlock(&host_lock);
status = store_obj(hostname,
/* stored object = */ SDB_ATTRIBUTE, key, last_update,
&updated_attr);
}
}
- pthread_rwlock_unlock(&obj_lock);
+ pthread_rwlock_unlock(&host_lock);
return status;
} /* sdb_store_attribute */
if ((! hostname) || (! name))
return -1;
- pthread_rwlock_wrlock(&obj_lock);
+ pthread_rwlock_wrlock(&host_lock);
status = store_obj(hostname,
/* stored object = */ SDB_SERVICE, name, last_update,
/* updated obj = */ NULL);
- pthread_rwlock_unlock(&obj_lock);
+ pthread_rwlock_unlock(&host_lock);
return status;
} /* sdb_store_service */
int
-sdb_store_host_tojson(sdb_store_base_t *h, sdb_strbuf_t *buf, int flags)
+sdb_store_host_tojson(sdb_store_obj_t *h, sdb_strbuf_t *buf, int flags)
{
sdb_host_t *host;
- char time_str[64];
- char interval_str[64];
if ((! h) || (h->type != SDB_HOST) || (! buf))
return -1;
host = HOST(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';
-
- if (! sdb_strfinterval(interval_str, sizeof(interval_str),
- host->_interval))
- snprintf(interval_str, sizeof(interval_str), "<error>");
- interval_str[sizeof(interval_str) - 1] = '\0';
-
- sdb_strbuf_append(buf, "{\"name\": \"%s\", "
- "\"last_update\": \"%s\", \"update_interval\": \"%s\"",
- SDB_OBJ(host)->name, time_str, interval_str);
+ sdb_strbuf_append(buf, "{\"name\": \"%s\", ", SDB_OBJ(host)->name);
+ store_common_tojson(h, buf);
if (! (flags & SDB_SKIP_ATTRIBUTES)) {
sdb_strbuf_append(buf, ", \"attributes\": ");
if (! buf)
return -1;
- pthread_rwlock_rdlock(&obj_lock);
+ pthread_rwlock_rdlock(&host_lock);
host_iter = sdb_llist_get_iter(host_list);
if (! host_iter) {
- pthread_rwlock_unlock(&obj_lock);
+ pthread_rwlock_unlock(&host_lock);
return -1;
}
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));
+ sdb_store_obj_t *host = STORE_OBJ(sdb_llist_iter_get_next(host_iter));
assert(host);
if (sdb_store_host_tojson(host, buf, flags))
sdb_strbuf_append(buf, "]}");
sdb_llist_iter_destroy(host_iter);
- pthread_rwlock_unlock(&obj_lock);
+ pthread_rwlock_unlock(&host_lock);
return 0;
} /* sdb_store_tojson */
sdb_llist_iter_t *host_iter;
int status = 0;
- pthread_rwlock_rdlock(&obj_lock);
+ pthread_rwlock_rdlock(&host_lock);
host_iter = sdb_llist_get_iter(host_list);
if (! host_iter)
/* has_next returns false if the iterator is NULL */
while (sdb_llist_iter_has_next(host_iter)) {
- sdb_store_base_t *host = STORE_BASE(sdb_llist_iter_get_next(host_iter));
+ sdb_store_obj_t *host = STORE_OBJ(sdb_llist_iter_get_next(host_iter));
assert(host);
if (cb(host, user_data)) {
}
sdb_llist_iter_destroy(host_iter);
- pthread_rwlock_unlock(&obj_lock);
+ pthread_rwlock_unlock(&host_lock);
return status;
} /* sdb_store_iterate */