![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/core/store.c b/src/core/store.c
index 9c83218f1efccbde39512f6831383d5f99c5801e..fa72955886bfa04778daa110bc02515b909919b1 100644 (file)
--- a/src/core/store.c
+++ b/src/core/store.c
#include <stdlib.h>
#include <string.h>
-#include <math.h>
#include <pthread.h>
/*
int type;
const char *name;
sdb_time_t last_update;
+ const char * const *backends;
+ size_t backends_num;
} store_obj_t;
-#define STORE_OBJ_INIT { NULL, NULL, 0, NULL, 0 }
+#define STORE_OBJ_INIT { NULL, NULL, 0, NULL, 0, NULL, 0 }
static sdb_type_t host_type;
static sdb_type_t service_type;
*/
static int
-record_backend(sdb_store_obj_t *obj)
+record_backends(sdb_store_obj_t *obj,
+ const char * const *backends, size_t backends_num)
{
- const sdb_plugin_info_t *info;
char **tmp;
size_t i;
- info = sdb_plugin_current();
- if (! info)
- return 0;
+ for (i = 0; i < backends_num; i++) {
+ bool found = 0;
+ size_t j;
- for (i = 0; i < obj->backends_num; ++i)
- if (!strcasecmp(obj->backends[i], info->plugin_name))
- return 0;
+ for (j = 0; j < obj->backends_num; ++j) {
+ if (!strcasecmp(obj->backends[j], backends[i])) {
+ found = 1;
+ break;
+ }
+ }
+ if (found)
+ continue;
- tmp = realloc(obj->backends,
- (obj->backends_num + 1) * sizeof(*obj->backends));
- if (! tmp)
- return -1;
+ tmp = realloc(obj->backends,
+ (obj->backends_num + 1) * sizeof(*obj->backends));
+ if (! tmp)
+ return -1;
- obj->backends = tmp;
- obj->backends[obj->backends_num] = strdup(info->plugin_name);
- if (! obj->backends[obj->backends_num])
- return -1;
+ obj->backends = tmp;
+ obj->backends[obj->backends_num] = strdup(backends[i]);
+ if (! obj->backends[obj->backends_num])
+ return -1;
- ++obj->backends_num;
+ ++obj->backends_num;
+ }
return 0;
-} /* record_backend */
+} /* record_backends */
static int
store_obj(store_obj_t *obj, sdb_store_obj_t **updated_obj)
if (updated_obj)
*updated_obj = new;
- if (record_backend(new))
+ if (record_backends(new, obj->backends, obj->backends_num))
return -1;
return status;
} /* store_obj */
return host->services;
} /* get_host_children */
-/*
- * ts_tojson serializes a time-series to JSON.
- *
- * The function never returns an error. Rather, an error message will be part
- * of the serialized data.
- */
-static void
-ts_tojson(sdb_timeseries_t *ts, sdb_strbuf_t *buf)
-{
- char start_str[64];
- char end_str[64];
-
- size_t i;
-
- /* TODO: make time format configurable */
- if (! sdb_strftime(start_str, sizeof(start_str), ts->start))
- snprintf(start_str, sizeof(start_str), "<error>");
- start_str[sizeof(start_str) - 1] = '\0';
- if (! sdb_strftime(end_str, sizeof(end_str), ts->end))
- snprintf(end_str, sizeof(end_str), "<error>");
- end_str[sizeof(end_str) - 1] = '\0';
-
- sdb_strbuf_append(buf, "{\"start\": \"%s\", \"end\": \"%s\", \"data\": {",
- start_str, end_str);
-
- for (i = 0; i < ts->data_names_len; ++i) {
- size_t j;
- sdb_strbuf_append(buf, "\"%s\": [", ts->data_names[i]);
-
- for (j = 0; j < ts->data_len; ++j) {
- char time_str[64];
-
- if (! sdb_strftime(time_str, sizeof(time_str), ts->data[i][j].timestamp))
- snprintf(time_str, sizeof(time_str), "<error>");
- time_str[sizeof(time_str) - 1] = '\0';
-
- /* Some GNU libc versions may print '-nan' which we dont' want */
- if (isnan(ts->data[i][j].value))
- sdb_strbuf_append(buf, "{\"timestamp\": \"%s\", "
- "\"value\": \"nan\"}", time_str);
- else
- sdb_strbuf_append(buf, "{\"timestamp\": \"%s\", "
- "\"value\": \"%f\"}", time_str, ts->data[i][j].value);
-
- if (j < ts->data_len - 1)
- sdb_strbuf_append(buf, ",");
- }
-
- if (i < ts->data_names_len - 1)
- sdb_strbuf_append(buf, "],");
- else
- sdb_strbuf_append(buf, "]");
- }
- sdb_strbuf_append(buf, "}}");
-} /* ts_tojson */
-
/*
* store writer API
*/
obj.type = SDB_ATTRIBUTE;
obj.name = attr->key;
obj.last_update = attr->last_update;
+ obj.backends = attr->backends;
+ obj.backends_num = attr->backends_num;
if (! status)
status = store_obj(&obj, &new);
store_host(sdb_store_host_t *host, sdb_object_t *user_data)
{
sdb_store_t *st = SDB_STORE(user_data);
- store_obj_t obj = { NULL, st->hosts, SDB_HOST, NULL, 0 };
+ store_obj_t obj = { NULL, st->hosts, SDB_HOST, NULL, 0, NULL, 0 };
int status = 0;
if ((! host) || (! host->name))
obj.name = host->name;
obj.last_update = host->last_update;
+ obj.backends = host->backends;
+ obj.backends_num = host->backends_num;
pthread_rwlock_wrlock(&st->host_lock);
status = store_obj(&obj, NULL);
pthread_rwlock_unlock(&st->host_lock);
obj.name = service->name;
obj.last_update = service->last_update;
+ obj.backends = service->backends;
+ obj.backends_num = service->backends_num;
if (! status)
status = store_obj(&obj, NULL);
obj.name = metric->name;
obj.last_update = metric->last_update;
+ obj.backends = metric->backends;
+ obj.backends_num = metric->backends_num;
if (! status)
status = store_obj(&obj, &new);
sdb_object_deref(SDB_OBJ(host));
static int
execute_query(sdb_object_t *q,
- sdb_strbuf_t *buf, sdb_strbuf_t *errbuf,
+ sdb_store_writer_t *w, sdb_object_t *wd, sdb_strbuf_t *errbuf,
sdb_object_t *user_data)
{
return sdb_store_query_execute(SDB_STORE(user_data),
- QUERY(q), buf, errbuf);
+ QUERY(q), w, wd, errbuf);
} /* execute_query */
sdb_store_reader_t sdb_store_reader = {
return 0;
} /* sdb_store_get_attr */
-/* TODO: sdb_store_fetch_timeseries should move into the plugin module */
-
-int
-sdb_store_fetch_timeseries(sdb_store_t *store,
- const char *hostname, const char *metric,
- sdb_timeseries_opts_t *opts, sdb_strbuf_t *buf)
-{
- sdb_avltree_t *metrics;
- host_t *host;
- sdb_metric_t *m;
-
- sdb_timeseries_t *ts;
-
- int status = 0;
-
- if ((! store) || (! hostname) || (! metric) || (! opts) || (! buf))
- return -1;
-
- pthread_rwlock_rdlock(&store->host_lock);
- host = HOST(sdb_avltree_lookup(store->hosts, hostname));
- metrics = get_host_children(host, SDB_METRIC);
- sdb_object_deref(SDB_OBJ(host));
- if (! metrics) {
- sdb_log(SDB_LOG_ERR, "store: Failed to fetch time-series '%s/%s' "
- "- host '%s' not found", hostname, metric, hostname);
- pthread_rwlock_unlock(&store->host_lock);
- return -1;
- }
-
- m = METRIC(sdb_avltree_lookup(metrics, metric));
- if (! m) {
- sdb_log(SDB_LOG_ERR, "store: Failed to fetch time-series '%s/%s' "
- "- metric '%s' not found", hostname, metric, metric);
- pthread_rwlock_unlock(&store->host_lock);
- return -1;
- }
-
- if ((! m->store.type) || (! m->store.id)) {
- sdb_log(SDB_LOG_ERR, "store: Failed to fetch time-series '%s/%s' "
- "- no data-store configured for the stored metric",
- hostname, metric);
- sdb_object_deref(SDB_OBJ(m));
- pthread_rwlock_unlock(&store->host_lock);
- return -1;
- }
-
- {
- char type[strlen(m->store.type) + 1];
- char id[strlen(m->store.id) + 1];
-
- strncpy(type, m->store.type, sizeof(type));
- strncpy(id, m->store.id, sizeof(id));
- pthread_rwlock_unlock(&store->host_lock);
-
- ts = sdb_plugin_fetch_timeseries(type, id, opts);
- if (! ts) {
- sdb_log(SDB_LOG_ERR, "store: Failed to fetch time-series '%s/%s' "
- "- %s fetcher callback returned no data for '%s'",
- hostname, metric, type, id);
- status = -1;
- }
- }
-
- ts_tojson(ts, buf);
- sdb_object_deref(SDB_OBJ(m));
- sdb_timeseries_destroy(ts);
- return status;
-} /* sdb_store_fetch_timeseries */
-
int
sdb_store_scan(sdb_store_t *store, int type,
sdb_store_matcher_t *m, sdb_store_matcher_t *filter,