diff --git a/src/core/store.c b/src/core/store.c
index bea4d2b578c421ed7706791e2aee0db95524de96..be8f9fa259406af1e31a2783560da81ca21776de 100644 (file)
--- a/src/core/store.c
+++ b/src/core/store.c
* private helper functions
*/
-static sdb_host_t *
-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(st->hosts, name));
-
- cname = strdup(name);
- cname = sdb_plugin_cname(cname);
- if (! cname) {
- sdb_log(SDB_LOG_ERR, "store: strdup failed");
- return NULL;
- }
-
- host = HOST(sdb_avltree_lookup(st->hosts, cname));
- free(cname);
- return host;
-} /* lookup_host */
-
static int
record_backend(sdb_store_obj_t *obj)
{
return -1;
pthread_rwlock_wrlock(&st->host_lock);
- host = lookup_host(st, hostname, /* canonicalize = */ 1);
+ host = HOST(sdb_avltree_lookup(st->hosts, hostname));
attrs = get_host_children(host, SDB_ATTRIBUTE);
if (! attrs) {
sdb_log(SDB_LOG_ERR, "store: Failed to store attribute '%s' - "
store_host(const char *name, sdb_time_t last_update, sdb_object_t *user_data)
{
sdb_store_t *st = SDB_STORE(user_data);
-
- char *cname = NULL;
int status = 0;
if (! name)
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);
status = store_obj(NULL, st->hosts,
- SDB_HOST, cname, last_update, NULL);
+ SDB_HOST, name, last_update, NULL);
pthread_rwlock_unlock(&st->host_lock);
- free(cname);
return status;
} /* store_host */
return -1;
pthread_rwlock_wrlock(&st->host_lock);
- host = lookup_host(st, hostname, /* canonicalize = */ 1);
+ host = HOST(sdb_avltree_lookup(st->hosts, hostname));
services = get_host_children(host, SDB_SERVICE);
sdb_object_deref(SDB_OBJ(host));
if (! services) {
return -1;
pthread_rwlock_wrlock(&st->host_lock);
- host = lookup_host(st, hostname, /* canonicalize = */ 1);
+ host = HOST(sdb_avltree_lookup(st->hosts, hostname));
services = get_host_children(host, SDB_SERVICE);
if (! services) {
sdb_log(SDB_LOG_ERR, "store: Failed to store service '%s' - "
return -1;
pthread_rwlock_wrlock(&st->host_lock);
- host = lookup_host(st, hostname, /* canonicalize = */ 1);
+ host = HOST(sdb_avltree_lookup(st->hosts, hostname));
metrics = get_host_children(host, SDB_METRIC);
sdb_object_deref(SDB_OBJ(host));
if (! metrics) {
}
pthread_rwlock_wrlock(&st->host_lock);
- host = lookup_host(st, hostname, /* canonicalize = */ 1);
+ host = HOST(sdb_avltree_lookup(st->hosts, hostname));
metrics = get_host_children(host, SDB_METRIC);
if (! metrics) {
sdb_log(SDB_LOG_ERR, "store: Failed to store metric '%s' - "
store_attribute, store_service_attr, store_metric_attr,
};
-/*
- * TODO: let prepare and execute accept a store object as their user_data
- * object
- */
-
static sdb_object_t *
prepare_query(sdb_ast_node_t *ast,
sdb_strbuf_t __attribute__((unused)) *errbuf,
if ((! store) || (! name))
return NULL;
- host = lookup_host(store, name, /* canonicalize = */ 0);
+ host = HOST(sdb_avltree_lookup(store->hosts, name));
if (! host)
return NULL;
return -1;
pthread_rwlock_rdlock(&store->host_lock);
- host = lookup_host(store, hostname, /* canonicalize = */ 1);
+ host = HOST(sdb_avltree_lookup(store->hosts, hostname));
metrics = get_host_children(host, SDB_METRIC);
sdb_object_deref(SDB_OBJ(host));
if (! metrics) {