![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/core/store.c b/src/core/store.c
index 22e177ca8f95d4a1246f443b73f0457f48678f2f..4e642de68042440a13f6b96171048de89f034178 100644 (file)
--- a/src/core/store.c
+++ b/src/core/store.c
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif /* HAVE_CONFIG_H */
+
#include "sysdb.h"
#include "core/store-private.h"
#include "core/plugin.h"
sobj->type = va_arg(ap, int);
sobj->last_update = va_arg(ap, sdb_time_t);
+ sobj->interval = 0;
sobj->parent = NULL;
return 0;
} /* store_base_init */
if (ret)
return ret;
- sobj->children = sdb_llist_create();
- if (! sobj->children)
+ sobj->services = sdb_llist_create();
+ if (! sobj->services)
return -1;
sobj->attributes = sdb_llist_create();
if (! sobj->attributes)
store_base_destroy(obj);
- if (sobj->children)
- sdb_llist_destroy(sobj->children);
+ if (sobj->services)
+ sdb_llist_destroy(sobj->services);
if (sobj->attributes)
sdb_llist_destroy(sobj->attributes);
} /* sdb_store_obj_destroy */
if ((type != SDB_HOST) && (STORE_BASE(sobj)->type == SDB_HOST))
continue;
- sobj = store_lookup_in_list(sobj->children, type, name);
+ sobj = store_lookup_in_list(sobj->services, type, name);
if (sobj) {
sdb_llist_iter_destroy(iter);
return sobj;
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,
- TYPE_TO_NAME(parent_type), parent_name);
+ "parent %s '%s' not found", SDB_STORE_TYPE_TO_NAME(type),
+ name, SDB_STORE_TYPE_TO_NAME(parent_type), parent_name);
free(parent_cname);
free(cname);
return -1;
if (type == SDB_ATTRIBUTE)
parent_list = parent->attributes;
else
- parent_list = parent->children;
+ parent_list = parent->services;
}
if (type == SDB_HOST)
if (old->last_update > last_update) {
sdb_log(SDB_LOG_DEBUG, "store: Cannot update %s '%s' - "
"value too old (%"PRIscTIME" < %"PRIscTIME")",
- TYPE_TO_NAME(type), name, last_update, old->last_update);
+ SDB_STORE_TYPE_TO_NAME(type), name,
+ last_update, old->last_update);
/* don't report an error; the object may be updated by multiple
* backends */
status = 1;
}
else {
+ sdb_time_t interval = last_update - old->last_update;
old->last_update = last_update;
+ if (interval) {
+ if (old->interval)
+ old->interval = (sdb_time_t)((0.9 * (double)old->interval)
+ + (0.1 * (double)interval));
+ else
+ old->interval = interval;
+ }
}
if (updated_obj)
if (! new) {
char errbuf[1024];
sdb_log(SDB_LOG_ERR, "store: Failed to create %s '%s': %s",
- TYPE_TO_NAME(type), name,
+ SDB_STORE_TYPE_TO_NAME(type), name,
sdb_strerror(errno, errbuf, sizeof(errbuf)));
free(parent_cname);
free(cname);
{
sdb_llist_iter_t *iter;
char time_str[64];
+ char interval_str[64];
assert((type == SDB_ATTRIBUTE) || (type == SDB_SERVICE));
if (! iter) {
char errbuf[1024];
sdb_log(SDB_LOG_ERR, "store: Failed to retrieve %ss: %s\n",
- TYPE_TO_NAME(type),
+ SDB_STORE_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);
+ SDB_STORE_TYPE_TO_NAME(type), errbuf);
}
/* has_next returns false if the iterator is NULL */
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';
+
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);
+ sdb_strbuf_append(buf, "\"value\": %s, \"last_update\": \"%s\", "
+ "\"update_interval\": \"%s\"}", tmp, time_str,
+ interval_str);
}
else
- sdb_strbuf_append(buf, "\"last_update\": \"%s\"}", time_str);
+ sdb_strbuf_append(buf, "\"last_update\": \"%s\", "
+ "\"update_interval\": \"%s\"}", time_str, interval_str);
if (sdb_llist_iter_has_next(iter))
sdb_strbuf_append(buf, ",");
if (status >= 0) {
assert(updated_attr);
+ sdb_data_free_datum(&SDB_ATTR(updated_attr)->value);
if (sdb_data_copy(&SDB_ATTR(updated_attr)->value, value)) {
sdb_object_deref(SDB_OBJ(updated_attr));
status = -1;
{
sdb_store_obj_t *host;
char time_str[64];
+ char interval_str[64];
if ((! h) || (h->type != SDB_HOST) || (! buf))
return -1;
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\"",
- SDB_OBJ(host)->name, time_str);
+ "\"last_update\": \"%s\", \"update_interval\": \"%s\"",
+ SDB_OBJ(host)->name, time_str, interval_str);
if (! (flags & SDB_SKIP_ATTRIBUTES)) {
sdb_strbuf_append(buf, ", \"attributes\": ");
if (! (flags & SDB_SKIP_SERVICES)) {
sdb_strbuf_append(buf, ", \"services\": ");
- store_obj_tojson(host->children, SDB_SERVICE, buf);
+ store_obj_tojson(host->services, SDB_SERVICE, buf);
}
sdb_strbuf_append(buf, "}");
return 0;
} /* sdb_store_host_tojson */
-/* TODO: actually support hierarchical data */
int
sdb_store_tojson(sdb_strbuf_t *buf, int flags)
{
return 0;
} /* sdb_store_tojson */
+/* TODO: actually support hierarchical data */
+int
+sdb_store_iterate(sdb_store_iter_cb cb, void *user_data)
+{
+ sdb_llist_iter_t *host_iter;
+ int status = 0;
+
+ pthread_rwlock_rdlock(&obj_lock);
+
+ host_iter = sdb_llist_get_iter(obj_list);
+ if (! host_iter)
+ status = -1;
+
+ /* 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));
+ assert(host);
+
+ if (cb(host, user_data)) {
+ status = -1;
+ break;
+ }
+ }
+
+ sdb_llist_iter_destroy(host_iter);
+ pthread_rwlock_unlock(&obj_lock);
+ return status;
+} /* sdb_store_iterate */
+
/* vim: set tw=78 sw=4 ts=4 noexpandtab : */