diff --git a/src/core/store.c b/src/core/store.c
index dc27eb48cd042c34b7bf9e101fd39dd8348ec85a..dace58f899f78ac27d681f22927ed088a7850170 100644 (file)
--- a/src/core/store.c
+++ b/src/core/store.c
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
* 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"
#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->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 */
sobj->parent = NULL;
return 0;
} /* store_base_init */
status = 1;
}
else {
status = 1;
}
else {
+ sdb_time_t interval = last_update - old->last_update;
old->last_update = 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 (updated_obj)
{
sdb_llist_iter_t *iter;
char time_str[64];
{
sdb_llist_iter_t *iter;
char time_str[64];
+ char interval_str[64];
assert((type == SDB_ATTRIBUTE) || (type == SDB_SERVICE));
assert((type == SDB_ATTRIBUTE) || (type == SDB_SERVICE));
snprintf(time_str, sizeof(time_str), "<error>");
time_str[sizeof(time_str) - 1] = '\0';
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_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_strbuf_append(buf, "\"value\": %s, \"last_update\": \"%s\"}",
- tmp, time_str);
+ sdb_data_format(&SDB_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);
}
else
}
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 (sdb_llist_iter_has_next(iter))
sdb_strbuf_append(buf, ",");
* public API
*/
* public API
*/
+void
+sdb_store_clear(void)
+{
+ sdb_llist_destroy(obj_list);
+ obj_list = NULL;
+} /* sdb_store_clear */
+
int
sdb_store_host(const char *name, sdb_time_t last_update)
{
int
sdb_store_host(const char *name, sdb_time_t last_update)
{
{
sdb_store_obj_t *host;
char time_str[64];
{
sdb_store_obj_t *host;
char time_str[64];
+ char interval_str[64];
if ((! h) || (h->type != SDB_HOST) || (! buf))
return -1;
if ((! h) || (h->type != SDB_HOST) || (! buf))
return -1;
snprintf(time_str, sizeof(time_str), "<error>");
time_str[sizeof(time_str) - 1] = '\0';
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\", "
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_ATTRIBUTES)) {
sdb_strbuf_append(buf, ", \"attributes\": ");
return 0;
} /* sdb_store_host_tojson */
return 0;
} /* sdb_store_host_tojson */
-/* TODO: actually support hierarchical data */
int
sdb_store_tojson(sdb_strbuf_t *buf, int flags)
{
int
sdb_store_tojson(sdb_strbuf_t *buf, int flags)
{
return 0;
} /* sdb_store_tojson */
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 : */
/* vim: set tw=78 sw=4 ts=4 noexpandtab : */