From: Sebastian Harl Date: Thu, 21 May 2015 22:46:58 +0000 (+0200) Subject: Merged branch 'master' of git://git.tokkee.org/sysdb. X-Git-Tag: sysdb-0.8.0~65 X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=commitdiff_plain;h=e04534362b8993b5400e0859aae9a38cfcc08aa6;hp=de284674bd3c1b96b90952c68e44a6f112e7447b Merged branch 'master' of git://git.tokkee.org/sysdb. --- diff --git a/src/core/plugin.c b/src/core/plugin.c index f581eb1..96df9fe 100644 --- a/src/core/plugin.c +++ b/src/core/plugin.c @@ -1344,10 +1344,12 @@ sdb_plugin_store_host(const char *name, sdb_time_t last_update) iter = sdb_llist_get_iter(writer_list); while (sdb_llist_iter_has_next(iter)) { sdb_plugin_writer_t *writer; + int s; writer = SDB_PLUGIN_WRITER(sdb_llist_iter_get_next(iter)); assert(writer); - if (writer->impl.store_host(name, last_update, writer->w_user_data)) - status = -1; + s = writer->impl.store_host(name, last_update, writer->w_user_data); + if (((s > 0) && (status >= 0)) || (s < 0)) + status = s; } sdb_llist_iter_destroy(iter); return status; @@ -1366,11 +1368,13 @@ sdb_plugin_store_service(const char *hostname, const char *name, iter = sdb_llist_get_iter(writer_list); while (sdb_llist_iter_has_next(iter)) { sdb_plugin_writer_t *writer; + int s; writer = SDB_PLUGIN_WRITER(sdb_llist_iter_get_next(iter)); assert(writer); - if (writer->impl.store_service(hostname, name, last_update, - writer->w_user_data)) - status = -1; + s = writer->impl.store_service(hostname, name, last_update, + writer->w_user_data); + if (((s > 0) && (status >= 0)) || (s < 0)) + status = s; } sdb_llist_iter_destroy(iter); return status; @@ -1392,11 +1396,13 @@ sdb_plugin_store_metric(const char *hostname, const char *name, iter = sdb_llist_get_iter(writer_list); while (sdb_llist_iter_has_next(iter)) { sdb_plugin_writer_t *writer; + int s; writer = SDB_PLUGIN_WRITER(sdb_llist_iter_get_next(iter)); assert(writer); - if (writer->impl.store_metric(hostname, name, store, last_update, - writer->w_user_data)) - status = -1; + s = writer->impl.store_metric(hostname, name, store, last_update, + writer->w_user_data); + if (((s > 0) && (status >= 0)) || (s < 0)) + status = s; } sdb_llist_iter_destroy(iter); return status; @@ -1415,11 +1421,13 @@ sdb_plugin_store_attribute(const char *hostname, const char *key, iter = sdb_llist_get_iter(writer_list); while (sdb_llist_iter_has_next(iter)) { sdb_plugin_writer_t *writer; + int s; writer = SDB_PLUGIN_WRITER(sdb_llist_iter_get_next(iter)); assert(writer); - if (writer->impl.store_attribute(hostname, key, value, last_update, - writer->w_user_data)) - status = -1; + s = writer->impl.store_attribute(hostname, key, value, last_update, + writer->w_user_data); + if (((s > 0) && (status >= 0)) || (s < 0)) + status = s; } sdb_llist_iter_destroy(iter); return status; @@ -1438,11 +1446,13 @@ sdb_plugin_store_service_attribute(const char *hostname, const char *service, iter = sdb_llist_get_iter(writer_list); while (sdb_llist_iter_has_next(iter)) { sdb_plugin_writer_t *writer; + int s; writer = SDB_PLUGIN_WRITER(sdb_llist_iter_get_next(iter)); assert(writer); - if (writer->impl.store_service_attr(hostname, service, - key, value, last_update, writer->w_user_data)) - status = -1; + s = writer->impl.store_service_attr(hostname, service, + key, value, last_update, writer->w_user_data); + if (((s > 0) && (status >= 0)) || (s < 0)) + status = s; } sdb_llist_iter_destroy(iter); return status; @@ -1461,11 +1471,13 @@ sdb_plugin_store_metric_attribute(const char *hostname, const char *metric, iter = sdb_llist_get_iter(writer_list); while (sdb_llist_iter_has_next(iter)) { sdb_plugin_writer_t *writer; + int s; writer = SDB_PLUGIN_WRITER(sdb_llist_iter_get_next(iter)); assert(writer); - if (writer->impl.store_metric_attr(hostname, metric, - key, value, last_update, writer->w_user_data)) - status = -1; + s = writer->impl.store_metric_attr(hostname, metric, + key, value, last_update, writer->w_user_data); + if (((s > 0) && (status >= 0)) || (s < 0)) + status = s; } sdb_llist_iter_destroy(iter); return status; diff --git a/src/core/store.c b/src/core/store.c index 171e319..1396669 100644 --- a/src/core/store.c +++ b/src/core/store.c @@ -50,17 +50,55 @@ * private variables */ -static sdb_avltree_t *hosts = NULL; -static pthread_rwlock_t host_lock = PTHREAD_RWLOCK_INITIALIZER; +typedef struct { + sdb_object_t super; + + /* hosts are the top-level entries and + * reference everything else */ + sdb_avltree_t *hosts; + pthread_rwlock_t host_lock; +} sdb_store_t; +#define ST(obj) ((sdb_store_t *)(obj)) + +sdb_store_t *global_store = NULL; /* * private types */ -static sdb_type_t sdb_host_type; -static sdb_type_t sdb_service_type; -static sdb_type_t sdb_metric_type; -static sdb_type_t sdb_attribute_type; +static sdb_type_t host_type; +static sdb_type_t service_type; +static sdb_type_t metric_type; +static sdb_type_t attribute_type; + +static int +store_init(sdb_object_t *obj, va_list __attribute__((unused)) ap) +{ + int err; + if (! (ST(obj)->hosts = sdb_avltree_create())) + return -1; + if ((err = pthread_rwlock_init(&ST(obj)->host_lock, /* attr = */ NULL))) { + char errbuf[128]; + sdb_log(SDB_LOG_ERR, "store: Failed to initialize lock: %s", + sdb_strerror(err, errbuf, sizeof(errbuf))); + return -1; + } + return 0; +} /* store_init */ + +static void +store_destroy(sdb_object_t *obj) +{ + int err; + if ((err = pthread_rwlock_destroy(&ST(obj)->host_lock))) { + char errbuf[128]; + sdb_log(SDB_LOG_ERR, "store: Failed to destroy lock: %s", + sdb_strerror(err, errbuf, sizeof(errbuf))); + return; + } + sdb_avltree_destroy(ST(obj)->hosts); + ST(obj)->hosts = NULL; +} /* store_destroy */ static int store_obj_init(sdb_object_t *obj, va_list ap) @@ -96,7 +134,7 @@ store_obj_destroy(sdb_object_t *obj) } /* store_obj_destroy */ static int -sdb_host_init(sdb_object_t *obj, va_list ap) +host_init(sdb_object_t *obj, va_list ap) { sdb_host_t *sobj = HOST(obj); int ret; @@ -116,10 +154,10 @@ sdb_host_init(sdb_object_t *obj, va_list ap) if (! sobj->attributes) return -1; return 0; -} /* sdb_host_init */ +} /* host_init */ static void -sdb_host_destroy(sdb_object_t *obj) +host_destroy(sdb_object_t *obj) { sdb_host_t *sobj = HOST(obj); assert(obj); @@ -132,10 +170,10 @@ sdb_host_destroy(sdb_object_t *obj) sdb_avltree_destroy(sobj->metrics); if (sobj->attributes) sdb_avltree_destroy(sobj->attributes); -} /* sdb_host_destroy */ +} /* host_destroy */ static int -sdb_service_init(sdb_object_t *obj, va_list ap) +service_init(sdb_object_t *obj, va_list ap) { sdb_service_t *sobj = SVC(obj); int ret; @@ -149,10 +187,10 @@ sdb_service_init(sdb_object_t *obj, va_list ap) if (! sobj->attributes) return -1; return 0; -} /* sdb_service_init */ +} /* service_init */ static void -sdb_service_destroy(sdb_object_t *obj) +service_destroy(sdb_object_t *obj) { sdb_service_t *sobj = SVC(obj); assert(obj); @@ -161,10 +199,10 @@ sdb_service_destroy(sdb_object_t *obj) if (sobj->attributes) sdb_avltree_destroy(sobj->attributes); -} /* sdb_service_destroy */ +} /* service_destroy */ static int -sdb_metric_init(sdb_object_t *obj, va_list ap) +metric_init(sdb_object_t *obj, va_list ap) { sdb_metric_t *sobj = METRIC(obj); int ret; @@ -180,10 +218,10 @@ sdb_metric_init(sdb_object_t *obj, va_list ap) sobj->store.type = sobj->store.id = NULL; return 0; -} /* sdb_metric_init */ +} /* metric_init */ static void -sdb_metric_destroy(sdb_object_t *obj) +metric_destroy(sdb_object_t *obj) { sdb_metric_t *sobj = METRIC(obj); assert(obj); @@ -197,10 +235,10 @@ sdb_metric_destroy(sdb_object_t *obj) free(sobj->store.type); if (sobj->store.id) free(sobj->store.id); -} /* sdb_metric_destroy */ +} /* metric_destroy */ static int -sdb_attr_init(sdb_object_t *obj, va_list ap) +attr_init(sdb_object_t *obj, va_list ap) { const sdb_data_t *value; int ret; @@ -216,39 +254,45 @@ sdb_attr_init(sdb_object_t *obj, va_list ap) if (sdb_data_copy(&ATTR(obj)->value, value)) return -1; return 0; -} /* sdb_attr_init */ +} /* attr_init */ static void -sdb_attr_destroy(sdb_object_t *obj) +attr_destroy(sdb_object_t *obj) { assert(obj); store_obj_destroy(obj); sdb_data_free_datum(&ATTR(obj)->value); -} /* sdb_attr_destroy */ +} /* attr_destroy */ + +static sdb_type_t store_type = { + /* size = */ sizeof(sdb_store_t), + /* init = */ store_init, + /* destroy = */ store_destroy, +}; -static sdb_type_t sdb_host_type = { - sizeof(sdb_host_t), - sdb_host_init, - sdb_host_destroy +static sdb_type_t host_type = { + /* size = */ sizeof(sdb_host_t), + /* init = */ host_init, + /* destroy = */ host_destroy }; -static sdb_type_t sdb_service_type = { - sizeof(sdb_service_t), - sdb_service_init, - sdb_service_destroy +static sdb_type_t service_type = { + /* size = */ sizeof(sdb_service_t), + /* init = */ service_init, + /* destroy = */ service_destroy }; -static sdb_type_t sdb_metric_type = { - sizeof(sdb_metric_t), - sdb_metric_init, - sdb_metric_destroy +static sdb_type_t metric_type = { + /* size = */ sizeof(sdb_metric_t), + /* init = */ metric_init, + /* destroy = */ metric_destroy }; -static sdb_type_t sdb_attribute_type = { - sizeof(sdb_attribute_t), - sdb_attr_init, - sdb_attr_destroy +static sdb_type_t attribute_type = { + /* size = */ sizeof(sdb_attribute_t), + /* init = */ attr_init, + /* destroy = */ attr_destroy }; /* @@ -256,14 +300,14 @@ static sdb_type_t sdb_attribute_type = { */ static sdb_host_t * -lookup_host(const char *name, bool canonicalize) +lookup_host(sdb_store_t *st, const char *name, bool canonicalize) { sdb_host_t *host; char *cname; assert(name); if (! canonicalize) - return HOST(sdb_avltree_lookup(hosts, name)); + return HOST(sdb_avltree_lookup(st->hosts, name)); cname = strdup(name); cname = sdb_plugin_cname(cname); @@ -272,7 +316,7 @@ lookup_host(const char *name, bool canonicalize) return NULL; } - host = HOST(sdb_avltree_lookup(hosts, cname)); + host = HOST(sdb_avltree_lookup(st->hosts, cname)); free(cname); return host; } /* lookup_host */ @@ -353,16 +397,16 @@ store_obj(sdb_store_obj_t *parent, sdb_avltree_t *parent_tree, else { if (type == SDB_ATTRIBUTE) { /* the value will be updated by the caller */ - new = STORE_OBJ(sdb_object_create(name, sdb_attribute_type, + new = STORE_OBJ(sdb_object_create(name, attribute_type, type, last_update, NULL)); } else { sdb_type_t t; t = type == SDB_HOST - ? sdb_host_type + ? host_type : type == SDB_SERVICE - ? sdb_service_type - : sdb_metric_type; + ? service_type + : metric_type; new = STORE_OBJ(sdb_object_create(name, t, type, last_update)); } @@ -454,7 +498,7 @@ store_metric_store(sdb_metric_t *metric, sdb_metric_store_t *store) return 0; } /* store_metric_store */ -/* The host_lock has to be acquired before calling this function. */ +/* The store's host_lock has to be acquired before calling this function. */ static sdb_avltree_t * get_host_children(sdb_host_t *host, int type) { @@ -530,111 +574,117 @@ ts_tojson(sdb_timeseries_t *ts, sdb_strbuf_t *buf) } /* ts_tojson */ /* - * public API + * store writer API */ -void -sdb_store_clear(void) +static int +store_attribute(const char *hostname, + const char *key, const sdb_data_t *value, + sdb_time_t last_update, sdb_object_t *user_data) { - sdb_avltree_destroy(hosts); - hosts = NULL; -} /* sdb_store_clear */ + sdb_store_t *st = ST(user_data); -int -sdb_store_host(const char *name, sdb_time_t last_update) -{ - char *cname = NULL; + sdb_host_t *host; + sdb_avltree_t *attrs; int status = 0; - if (! name) + if ((! hostname) || (! key)) return -1; - cname = sdb_plugin_cname(strdup(name)); - if (! cname) { - sdb_log(SDB_LOG_ERR, "store: strdup failed"); - return -1; + pthread_rwlock_wrlock(&st->host_lock); + host = lookup_host(st, hostname, /* canonicalize = */ 1); + attrs = get_host_children(host, SDB_ATTRIBUTE); + if (! attrs) { + sdb_log(SDB_LOG_ERR, "store: Failed to store attribute '%s' - " + "host '%s' not found", key, hostname); + status = -1; } - pthread_rwlock_wrlock(&host_lock); - if (! hosts) - if (! (hosts = sdb_avltree_create())) - status = -1; - if (! status) - status = store_obj(NULL, hosts, SDB_HOST, cname, last_update, NULL); - pthread_rwlock_unlock(&host_lock); + status = store_attr(STORE_OBJ(host), attrs, key, value, last_update); - if (sdb_plugin_store_host(name, last_update)) - status = -1; + sdb_object_deref(SDB_OBJ(host)); + pthread_rwlock_unlock(&st->host_lock); - free(cname); return status; -} /* sdb_store_host */ +} /* store_attribute */ -bool -sdb_store_has_host(const char *name) +static int +store_host(const char *name, sdb_time_t last_update, sdb_object_t *user_data) { - sdb_host_t *host; - - if (! name) - return NULL; + sdb_store_t *st = ST(user_data); - host = lookup_host(name, /* canonicalize = */ 0); - sdb_object_deref(SDB_OBJ(host)); - return host != NULL; -} /* sdb_store_has_host */ - -sdb_store_obj_t * -sdb_store_get_host(const char *name) -{ - sdb_host_t *host; + char *cname = NULL; + int status = 0; if (! name) - return NULL; + return -1; - host = lookup_host(name, /* canonicalize = */ 0); - if (! host) - return NULL; + cname = sdb_plugin_cname(strdup(name)); + if (! cname) { + sdb_log(SDB_LOG_ERR, "store: strdup failed"); + return -1; + } - return STORE_OBJ(host); -} /* sdb_store_get_host */ + pthread_rwlock_wrlock(&st->host_lock); + status = store_obj(NULL, st->hosts, + SDB_HOST, cname, last_update, NULL); + pthread_rwlock_unlock(&st->host_lock); -int -sdb_store_attribute(const char *hostname, - const char *key, const sdb_data_t *value, - sdb_time_t last_update) + free(cname); + return status; +} /* store_host */ + +static int +store_service_attr(const char *hostname, const char *service, + const char *key, const sdb_data_t *value, sdb_time_t last_update, + sdb_object_t *user_data) { + sdb_store_t *st = ST(user_data); + sdb_host_t *host; - sdb_avltree_t *attrs; + sdb_service_t *svc; + sdb_avltree_t *services; int status = 0; - if ((! hostname) || (! key)) + if ((! hostname) || (! service) || (! key)) return -1; - pthread_rwlock_wrlock(&host_lock); - host = lookup_host(hostname, /* canonicalize = */ 1); - attrs = get_host_children(host, SDB_ATTRIBUTE); - if (! attrs) { + pthread_rwlock_wrlock(&st->host_lock); + host = lookup_host(st, hostname, /* canonicalize = */ 1); + services = get_host_children(host, SDB_SERVICE); + sdb_object_deref(SDB_OBJ(host)); + if (! services) { + sdb_log(SDB_LOG_ERR, "store: Failed to store attribute '%s' " + "for service '%s' - host '%ss' not found", + key, service, hostname); + pthread_rwlock_unlock(&st->host_lock); + return -1; + } + + svc = SVC(sdb_avltree_lookup(services, service)); + if (! svc) { sdb_log(SDB_LOG_ERR, "store: Failed to store attribute '%s' - " - "host '%s' not found", key, hostname); + "service '%s/%s' not found", key, hostname, service); status = -1; } if (! status) - status = store_attr(STORE_OBJ(host), attrs, key, value, last_update); + status = store_attr(STORE_OBJ(svc), svc->attributes, + key, value, last_update); - sdb_object_deref(SDB_OBJ(host)); - pthread_rwlock_unlock(&host_lock); + sdb_object_deref(SDB_OBJ(svc)); + pthread_rwlock_unlock(&st->host_lock); - if (sdb_plugin_store_attribute(hostname, key, value, last_update)) - status = -1; return status; -} /* sdb_store_attribute */ +} /* store_service_attr */ -int -sdb_store_service(const char *hostname, const char *name, - sdb_time_t last_update) +static int +store_service(const char *hostname, const char *name, + sdb_time_t last_update, sdb_object_t *user_data) { + sdb_store_t *st = ST(user_data); + sdb_host_t *host; sdb_avltree_t *services; sdb_data_t d; @@ -644,8 +694,8 @@ sdb_store_service(const char *hostname, const char *name, if ((! hostname) || (! name)) return -1; - pthread_rwlock_wrlock(&host_lock); - host = lookup_host(hostname, /* canonicalize = */ 1); + pthread_rwlock_wrlock(&st->host_lock); + host = lookup_host(st, hostname, /* canonicalize = */ 1); services = get_host_children(host, SDB_SERVICE); if (! services) { sdb_log(SDB_LOG_ERR, "store: Failed to store service '%s' - " @@ -658,70 +708,70 @@ sdb_store_service(const char *hostname, const char *name, name, last_update, NULL); sdb_object_deref(SDB_OBJ(host)); - pthread_rwlock_unlock(&host_lock); + pthread_rwlock_unlock(&st->host_lock); if (status) return status; - if (sdb_plugin_store_service(hostname, name, last_update)) - status = -1; - /* record the hostname as an attribute */ d.type = SDB_TYPE_STRING; d.data.string = SDB_OBJ(host)->name; - if (sdb_store_service_attr(hostname, name, "hostname", &d, last_update)) + if (store_service_attr(hostname, name, "hostname", &d, last_update, user_data)) status = -1; return status; -} /* sdb_store_service */ +} /* store_service */ -int -sdb_store_service_attr(const char *hostname, const char *service, - const char *key, const sdb_data_t *value, sdb_time_t last_update) +static int +store_metric_attr(const char *hostname, const char *metric, + const char *key, const sdb_data_t *value, sdb_time_t last_update, + sdb_object_t *user_data) { + sdb_store_t *st = ST(user_data); + + sdb_avltree_t *metrics; sdb_host_t *host; - sdb_service_t *svc; - sdb_avltree_t *services; + sdb_metric_t *m; int status = 0; - if ((! hostname) || (! service) || (! key)) + if ((! hostname) || (! metric) || (! key)) return -1; - pthread_rwlock_wrlock(&host_lock); - host = lookup_host(hostname, /* canonicalize = */ 1); - services = get_host_children(host, SDB_SERVICE); + pthread_rwlock_wrlock(&st->host_lock); + host = lookup_host(st, hostname, /* canonicalize = */ 1); + metrics = get_host_children(host, SDB_METRIC); sdb_object_deref(SDB_OBJ(host)); - if (! services) { + if (! metrics) { sdb_log(SDB_LOG_ERR, "store: Failed to store attribute '%s' " - "for service '%s' - host '%ss' not found", - key, service, hostname); - pthread_rwlock_unlock(&host_lock); + "for metric '%s' - host '%s' not found", + key, metric, hostname); + pthread_rwlock_unlock(&st->host_lock); return -1; } - svc = SVC(sdb_avltree_lookup(services, service)); - if (! svc) { + m = METRIC(sdb_avltree_lookup(metrics, metric)); + if (! m) { sdb_log(SDB_LOG_ERR, "store: Failed to store attribute '%s' - " - "service '%s/%s' not found", key, hostname, service); + "metric '%s/%s' not found", key, hostname, metric); status = -1; } if (! status) - status = store_attr(STORE_OBJ(svc), svc->attributes, + status = store_attr(STORE_OBJ(m), m->attributes, key, value, last_update); - sdb_object_deref(SDB_OBJ(svc)); - pthread_rwlock_unlock(&host_lock); + sdb_object_deref(SDB_OBJ(m)); + pthread_rwlock_unlock(&st->host_lock); - if (sdb_plugin_store_service_attribute(hostname, service, - key, value, last_update)) - status = -1; return status; -} /* sdb_store_service_attr */ +} /* store_metric_attr */ -int -sdb_store_metric(const char *hostname, const char *name, - sdb_metric_store_t *store, sdb_time_t last_update) +static int +store_metric(const char *hostname, const char *name, + sdb_metric_store_t *store, sdb_time_t last_update, + sdb_object_t *user_data) { + sdb_store_t *st = ST(user_data); + sdb_store_obj_t *obj = NULL; sdb_host_t *host; sdb_metric_t *metric; @@ -741,8 +791,8 @@ sdb_store_metric(const char *hostname, const char *name, store = NULL; } - pthread_rwlock_wrlock(&host_lock); - host = lookup_host(hostname, /* canonicalize = */ 1); + pthread_rwlock_wrlock(&st->host_lock); + host = lookup_host(st, hostname, /* canonicalize = */ 1); metrics = get_host_children(host, SDB_METRIC); if (! metrics) { sdb_log(SDB_LOG_ERR, "store: Failed to store metric '%s' - " @@ -756,7 +806,7 @@ sdb_store_metric(const char *hostname, const char *name, sdb_object_deref(SDB_OBJ(host)); if (status) { - pthread_rwlock_unlock(&host_lock); + pthread_rwlock_unlock(&st->host_lock); return status; } @@ -766,62 +816,119 @@ sdb_store_metric(const char *hostname, const char *name, if (store) if (store_metric_store(metric, store)) status = -1; - pthread_rwlock_unlock(&host_lock); - - if (sdb_plugin_store_metric(hostname, name, store, last_update)) - status = -1; + pthread_rwlock_unlock(&st->host_lock); /* record the hostname as an attribute */ d.type = SDB_TYPE_STRING; d.data.string = SDB_OBJ(host)->name; - if (sdb_store_metric_attr(hostname, name, "hostname", &d, last_update)) + if (store_metric_attr(hostname, name, "hostname", &d, last_update, user_data)) status = -1; return status; +} /* store_metric */ + +static sdb_store_writer_t store_writer = { + store_host, store_service, store_metric, + store_attribute, store_service_attr, store_metric_attr, +}; + +/* + * public API + */ + +int +sdb_store_init(void) +{ + if (global_store) + return 0; + + global_store = ST(sdb_object_create("store", store_type)); + if (! global_store) { + sdb_log(SDB_LOG_ERR, "store: Failed to allocate store"); + return -1; + } + return sdb_plugin_register_writer("memstore", + &store_writer, SDB_OBJ(global_store)); +} /* sdb_store_init */ + +void +sdb_store_clear(void) +{ + if (! global_store) + return; + sdb_avltree_clear(global_store->hosts); +} /* sdb_store_clear */ + +int +sdb_store_host(const char *name, sdb_time_t last_update) +{ + return sdb_plugin_store_host(name, last_update); +} /* sdb_store_host */ + +int +sdb_store_attribute(const char *hostname, + const char *key, const sdb_data_t *value, + sdb_time_t last_update) +{ + return sdb_plugin_store_attribute(hostname, key, value, last_update); +} /* sdb_store_attribute */ + +int +sdb_store_service(const char *hostname, const char *name, + sdb_time_t last_update) +{ + return sdb_plugin_store_service(hostname, name, last_update); +} /* sdb_store_service */ + +int +sdb_store_service_attr(const char *hostname, const char *service, + const char *key, const sdb_data_t *value, sdb_time_t last_update) +{ + return sdb_plugin_store_service_attribute(hostname, service, + key, value, last_update); +} /* sdb_store_service_attr */ + +int +sdb_store_metric(const char *hostname, const char *name, + sdb_metric_store_t *store, sdb_time_t last_update) +{ + return sdb_plugin_store_metric(hostname, name, store, last_update); } /* sdb_store_metric */ int sdb_store_metric_attr(const char *hostname, const char *metric, const char *key, const sdb_data_t *value, sdb_time_t last_update) { - sdb_avltree_t *metrics; + return sdb_plugin_store_metric_attribute(hostname, metric, + key, value, last_update); +} /* sdb_store_metric_attr */ + +bool +sdb_store_has_host(const char *name) +{ sdb_host_t *host; - sdb_metric_t *m; - int status = 0; - if ((! hostname) || (! metric) || (! key)) - return -1; + if ((! global_store) || (! name)) + return false; - pthread_rwlock_wrlock(&host_lock); - host = lookup_host(hostname, /* canonicalize = */ 1); - metrics = get_host_children(host, SDB_METRIC); + host = lookup_host(global_store, name, /* canonicalize = */ 0); sdb_object_deref(SDB_OBJ(host)); - if (! metrics) { - sdb_log(SDB_LOG_ERR, "store: Failed to store attribute '%s' " - "for metric '%s' - host '%s' not found", - key, metric, hostname); - pthread_rwlock_unlock(&host_lock); - return -1; - } + return host != NULL; +} /* sdb_store_has_host */ - m = METRIC(sdb_avltree_lookup(metrics, metric)); - if (! m) { - sdb_log(SDB_LOG_ERR, "store: Failed to store attribute '%s' - " - "metric '%s/%s' not found", key, hostname, metric); - status = -1; - } +sdb_store_obj_t * +sdb_store_get_host(const char *name) +{ + sdb_host_t *host; - if (! status) - status = store_attr(STORE_OBJ(m), m->attributes, - key, value, last_update); + if ((! global_store) || (! name)) + return NULL; - sdb_object_deref(SDB_OBJ(m)); - pthread_rwlock_unlock(&host_lock); + host = lookup_host(global_store, name, /* canonicalize = */ 0); + if (! host) + return NULL; - if (sdb_plugin_store_metric_attribute(hostname, metric, - key, value, last_update)) - status = -1; - return status; -} /* sdb_store_metric_attr */ + return STORE_OBJ(host); +} /* sdb_store_get_host */ sdb_store_obj_t * sdb_store_get_child(sdb_store_obj_t *host, int type, const char *name) @@ -837,72 +944,6 @@ sdb_store_get_child(sdb_store_obj_t *host, int type, const char *name) return STORE_OBJ(sdb_avltree_lookup(children, name)); } /* sdb_store_get_child */ -int -sdb_store_fetch_timeseries(const char *hostname, const char *metric, - sdb_timeseries_opts_t *opts, sdb_strbuf_t *buf) -{ - sdb_avltree_t *metrics; - sdb_host_t *host; - sdb_metric_t *m; - - sdb_timeseries_t *ts; - - int status = 0; - - if ((! hostname) || (! metric) || (! opts) || (! buf)) - return -1; - - pthread_rwlock_rdlock(&host_lock); - host = lookup_host(hostname, /* canonicalize = */ 1); - 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(&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(&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(&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(&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_get_field(sdb_store_obj_t *obj, int field, sdb_data_t *res) { @@ -993,6 +1034,72 @@ sdb_store_get_attr(sdb_store_obj_t *obj, const char *name, sdb_data_t *res, return 0; } /* sdb_store_get_attr */ +int +sdb_store_fetch_timeseries(const char *hostname, const char *metric, + sdb_timeseries_opts_t *opts, sdb_strbuf_t *buf) +{ + sdb_avltree_t *metrics; + sdb_host_t *host; + sdb_metric_t *m; + + sdb_timeseries_t *ts; + + int status = 0; + + if ((! global_store) || (! hostname) || (! metric) || (! opts) || (! buf)) + return -1; + + pthread_rwlock_rdlock(&global_store->host_lock); + host = lookup_host(global_store, hostname, /* canonicalize = */ 1); + 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(&global_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(&global_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(&global_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(&global_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(int type, sdb_store_matcher_t *m, sdb_store_matcher_t *filter, sdb_store_lookup_cb cb, void *user_data) @@ -1000,7 +1107,7 @@ sdb_store_scan(int type, sdb_store_matcher_t *m, sdb_store_matcher_t *filter, sdb_avltree_iter_t *host_iter = NULL; int status = 0; - if (! cb) + if ((! global_store) || (! cb)) return -1; if ((type != SDB_HOST) && (type != SDB_SERVICE) && (type != SDB_METRIC)) { @@ -1008,13 +1115,10 @@ sdb_store_scan(int type, sdb_store_matcher_t *m, sdb_store_matcher_t *filter, return -1; } - pthread_rwlock_rdlock(&host_lock); - - if (hosts) { - host_iter = sdb_avltree_get_iter(hosts); - if (! host_iter) - status = -1; - } + pthread_rwlock_rdlock(&global_store->host_lock); + host_iter = sdb_avltree_get_iter(global_store->hosts); + if (! host_iter) + status = -1; /* has_next returns false if the iterator is NULL */ while (sdb_avltree_iter_has_next(host_iter)) { @@ -1062,7 +1166,7 @@ sdb_store_scan(int type, sdb_store_matcher_t *m, sdb_store_matcher_t *filter, } sdb_avltree_iter_destroy(host_iter); - pthread_rwlock_unlock(&host_lock); + pthread_rwlock_unlock(&global_store->host_lock); return status; } /* sdb_store_scan */ diff --git a/src/include/core/store.h b/src/include/core/store.h index c52299e..4a0960c 100644 --- a/src/include/core/store.h +++ b/src/include/core/store.h @@ -170,6 +170,18 @@ typedef struct { sdb_object_t *user_data); } sdb_store_writer_t; +/* + * sdb_store_init: + * Initialize the store sub-system. This function has to be called before + * doing any other store operations. + * + * Returns: + * - 0 on success + * - a negative value else + */ +int +sdb_store_init(void); + /* * sdb_store_clear: * Clear the entire store and remove all stored objects. diff --git a/src/tools/sysdbd/main.c b/src/tools/sysdbd/main.c index 759eee2..cc3525e 100644 --- a/src/tools/sysdbd/main.c +++ b/src/tools/sysdbd/main.c @@ -370,6 +370,8 @@ main(int argc, char **argv) if (sdb_ssl_init()) exit(1); + if (sdb_store_init()) + exit(1); sdb_plugin_init_all(); plugin_main_loop.default_interval = SECS_TO_SDB_TIME(60); diff --git a/t/unit/core/store_expr_test.c b/t/unit/core/store_expr_test.c index 679fb54..b15809a 100644 --- a/t/unit/core/store_expr_test.c +++ b/t/unit/core/store_expr_test.c @@ -92,6 +92,8 @@ populate(void) size_t i; + sdb_store_init(); + for (i = 0; i < SDB_STATIC_ARRAY_LEN(hosts); ++i) { int status = sdb_store_host(hosts[i], 1); ck_assert(status == 0); diff --git a/t/unit/core/store_json_test.c b/t/unit/core/store_json_test.c index 113d3a0..ebb2daf 100644 --- a/t/unit/core/store_json_test.c +++ b/t/unit/core/store_json_test.c @@ -44,6 +44,8 @@ populate(void) { sdb_data_t datum; + sdb_store_init(); + sdb_store_host("h1", 1 * SDB_INTERVAL_SECOND); sdb_store_host("h2", 3 * SDB_INTERVAL_SECOND); diff --git a/t/unit/core/store_lookup_test.c b/t/unit/core/store_lookup_test.c index b4c6015..913e6b7 100644 --- a/t/unit/core/store_lookup_test.c +++ b/t/unit/core/store_lookup_test.c @@ -73,6 +73,8 @@ populate(void) size_t i; + sdb_store_init(); + for (i = 0; i < SDB_STATIC_ARRAY_LEN(hosts); ++i) { int status = sdb_store_host(hosts[i], 1); fail_unless(status == 0, diff --git a/t/unit/core/store_test.c b/t/unit/core/store_test.c index dbf220c..8308f33 100644 --- a/t/unit/core/store_test.c +++ b/t/unit/core/store_test.c @@ -37,11 +37,19 @@ #include #include +static void +init(void) +{ + sdb_store_init(); +} + static void populate(void) { sdb_data_t datum; + sdb_store_init(); + sdb_store_host("h1", 1); sdb_store_host("h2", 3); @@ -779,7 +787,7 @@ TEST_MAIN("core::store") tcase_add_test(tc, test_get_child); tcase_add_test(tc, test_interval); tcase_add_test(tc, test_scan); - tcase_add_unchecked_fixture(tc, NULL, sdb_store_clear); + tcase_add_unchecked_fixture(tc, init, sdb_store_clear); ADD_TCASE(tc); } TEST_MAIN_END diff --git a/t/unit/frontend/query_test.c b/t/unit/frontend/query_test.c index 8047b26..d7e5b30 100644 --- a/t/unit/frontend/query_test.c +++ b/t/unit/frontend/query_test.c @@ -44,6 +44,8 @@ populate(void) { sdb_data_t datum; + sdb_store_init(); + sdb_store_host("h1", 1 * SDB_INTERVAL_SECOND); sdb_store_host("h2", 3 * SDB_INTERVAL_SECOND);