X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fcore%2Fstore.c;h=ab37e689641ec52b42f844bb5f1f1d3cd6236d63;hp=81aedfb7600a9243accbe4e49cceffcf87f8c54b;hb=da52b4da948c741d20c7a3995ce5d133af377def;hpb=22aa3b95ef9e01872eb7bd645c8dfea723b9c9d2 diff --git a/src/core/store.c b/src/core/store.c index 81aedfb..ab37e68 100644 --- a/src/core/store.c +++ b/src/core/store.c @@ -43,6 +43,7 @@ #include #include +#include #include /* @@ -88,8 +89,10 @@ store_obj_destroy(sdb_object_t *obj) sobj->backends = NULL; sobj->backends_num = 0; - if (sobj->parent) - sdb_object_deref(SDB_OBJ(sobj->parent)); + // We don't currently keep an extra reference for parent objects to + // avoid circular self-references which are not handled correctly by + // the ref-count base management layer. + //sdb_object_deref(SDB_OBJ(sobj->parent)); } /* store_obj_destroy */ static int @@ -253,9 +256,25 @@ static sdb_type_t sdb_attribute_type = { */ static sdb_host_t * -lookup_host(const char *name) +lookup_host(const char *name, bool canonicalize) { - return HOST(sdb_avltree_lookup(hosts, name)); + sdb_host_t *host; + char *cname; + + assert(name); + if (! canonicalize) + return HOST(sdb_avltree_lookup(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(hosts, cname)); + free(cname); + return host; } /* lookup_host */ static int @@ -288,8 +307,9 @@ record_backend(sdb_store_obj_t *obj) } /* record_backend */ static int -store_obj(sdb_avltree_t *parent_tree, int type, const char *name, - sdb_time_t last_update, sdb_store_obj_t **updated_obj) +store_obj(sdb_store_obj_t *parent, sdb_avltree_t *parent_tree, + int type, const char *name, sdb_time_t last_update, + sdb_store_obj_t **updated_obj) { sdb_store_obj_t *old, *new; int status = 0; @@ -365,6 +385,14 @@ store_obj(sdb_avltree_t *parent_tree, int type, const char *name, return status; assert(new); + if (new->parent != parent) { + // Avoid circular self-references which are not handled + // correctly by the ref-count based management layer. + //sdb_object_deref(SDB_OBJ(new->parent)); + //sdb_object_ref(SDB_OBJ(parent)); + new->parent = parent; + } + if (updated_obj) *updated_obj = new; @@ -374,13 +402,14 @@ store_obj(sdb_avltree_t *parent_tree, int type, const char *name, } /* store_obj */ static int -store_attr(sdb_avltree_t *attributes, const char *key, const sdb_data_t *value, - sdb_time_t last_update) +store_attr(sdb_store_obj_t *parent, sdb_avltree_t *attributes, + const char *key, const sdb_data_t *value, sdb_time_t last_update) { sdb_store_obj_t *attr = NULL; int status; - status = store_obj(attributes, SDB_ATTRIBUTE, key, last_update, &attr); + status = store_obj(parent, attributes, SDB_ATTRIBUTE, + key, last_update, &attr); if (status) return status; @@ -396,30 +425,15 @@ store_attr(sdb_avltree_t *attributes, const char *key, const sdb_data_t *value, /* The host_lock has to be acquired before calling this function. */ static sdb_avltree_t * -get_host_children(const char *hostname, int type) +get_host_children(sdb_host_t *host, int type) { - char *cname = NULL; - sdb_host_t *host; - - assert(hostname); - assert((type == SDB_SERVICE) || (type == SDB_METRIC) - || (type == SDB_ATTRIBUTE)); - - if (! hosts) - return NULL; - - cname = sdb_plugin_cname(strdup(hostname)); - if (! cname) { - sdb_log(SDB_LOG_ERR, "store: strdup failed"); + if ((type != SDB_SERVICE) && (type != SDB_METRIC) + && (type != SDB_ATTRIBUTE)) return NULL; - } - host = lookup_host(cname); - free(cname); if (! host) return NULL; - sdb_object_deref(SDB_OBJ(host)); if (type == SDB_ATTRIBUTE) return host->attributes; else if (type == SDB_METRIC) @@ -428,109 +442,6 @@ get_host_children(const char *hostname, int type) return host->services; } /* get_host_children */ -/* - * store_common_tojson serializes common object attributes to JSON. - * - * The function never returns an error. Rather, an error message will be part - * of the serialized data. - */ -static void -store_common_tojson(sdb_store_obj_t *obj, sdb_strbuf_t *buf) -{ - char time_str[64]; - char interval_str[64]; - size_t i; - - /* TODO: make time and interval formats configurable */ - if (! sdb_strftime(time_str, sizeof(time_str), - "%F %T %z", obj->last_update)) - snprintf(time_str, sizeof(time_str), ""); - time_str[sizeof(time_str) - 1] = '\0'; - - if (! sdb_strfinterval(interval_str, sizeof(interval_str), - obj->interval)) - snprintf(interval_str, sizeof(interval_str), ""); - interval_str[sizeof(interval_str) - 1] = '\0'; - - sdb_strbuf_append(buf, "\"last_update\": \"%s\", " - "\"update_interval\": \"%s\", \"backends\": [", - time_str, interval_str); - - for (i = 0; i < obj->backends_num; ++i) { - sdb_strbuf_append(buf, "\"%s\"", obj->backends[i]); - if (i < obj->backends_num - 1) - sdb_strbuf_append(buf, ","); - } - sdb_strbuf_append(buf, "]"); -} /* store_common_tojson */ - -/* - * store_obj_tojson serializes attribute / metric / service objects to JSON. - * - * The function never returns an error. Rather, an error message will be part - * of the serialized data. - */ -static void -store_obj_tojson(sdb_avltree_t *tree, int type, sdb_strbuf_t *buf, - sdb_store_matcher_t *filter, int flags) -{ - sdb_avltree_iter_t *iter; - - assert((type == SDB_ATTRIBUTE) - || (type == SDB_METRIC) - || (type == SDB_SERVICE)); - - sdb_strbuf_append(buf, "["); - iter = sdb_avltree_get_iter(tree); - if (! iter) { - char errbuf[1024]; - sdb_log(SDB_LOG_ERR, "store: Failed to retrieve %ss: %s\n", - SDB_STORE_TYPE_TO_NAME(type), - sdb_strerror(errno, errbuf, sizeof(errbuf))); - sdb_strbuf_append(buf, "{\"error\": \"failed to retrieve %ss: %s\"}", - SDB_STORE_TYPE_TO_NAME(type), errbuf); - } - - /* has_next returns false if the iterator is NULL */ - while (sdb_avltree_iter_has_next(iter)) { - sdb_store_obj_t *sobj = STORE_OBJ(sdb_avltree_iter_get_next(iter)); - assert(sobj); - assert(sobj->type == type); - - if (filter && (! sdb_store_matcher_matches(filter, sobj, NULL))) - continue; - - sdb_strbuf_append(buf, "{\"name\": \"%s\", ", SDB_OBJ(sobj)->name); - if (sobj->type == SDB_ATTRIBUTE) { - char tmp[sdb_data_strlen(&ATTR(sobj)->value) + 1]; - sdb_data_format(&ATTR(sobj)->value, tmp, sizeof(tmp), - SDB_DOUBLE_QUOTED); - sdb_strbuf_append(buf, "\"value\": %s, ", tmp); - } - store_common_tojson(sobj, buf); - - if ((sobj->type == SDB_SERVICE) - && (! (flags & SDB_SKIP_ATTRIBUTES))) { - sdb_strbuf_append(buf, ", \"attributes\": "); - store_obj_tojson(SVC(sobj)->attributes, SDB_ATTRIBUTE, - buf, filter, flags); - } - else if ((sobj->type == SDB_METRIC) - && (! (flags & SDB_SKIP_ATTRIBUTES))) { - sdb_strbuf_append(buf, ", \"attributes\": "); - store_obj_tojson(METRIC(sobj)->attributes, SDB_ATTRIBUTE, - buf, filter, flags); - } - sdb_strbuf_append(buf, "}"); - - if (sdb_avltree_iter_has_next(iter)) - sdb_strbuf_append(buf, ","); - } - - sdb_avltree_iter_destroy(iter); - sdb_strbuf_append(buf, "]"); -} /* store_obj_tojson */ - /* * ts_tojson serializes a time-series to JSON. * @@ -570,8 +481,13 @@ ts_tojson(sdb_timeseries_t *ts, sdb_strbuf_t *buf) snprintf(time_str, sizeof(time_str), ""); time_str[sizeof(time_str) - 1] = '\0'; - sdb_strbuf_append(buf, "{\"timestamp\": \"%s\", " - "\"value\": \"%f\"}", time_str, ts->data[i][j].value); + /* 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, ","); @@ -617,14 +533,17 @@ sdb_store_host(const char *name, sdb_time_t last_update) status = -1; if (! status) - status = store_obj(hosts, SDB_HOST, cname, last_update, NULL); + status = store_obj(NULL, hosts, SDB_HOST, cname, last_update, NULL); pthread_rwlock_unlock(&host_lock); + if (sdb_plugin_store_host(name, last_update)) + status = -1; + free(cname); return status; } /* sdb_store_host */ -_Bool +bool sdb_store_has_host(const char *name) { sdb_host_t *host; @@ -632,7 +551,8 @@ sdb_store_has_host(const char *name) if (! name) return NULL; - host = lookup_host(name); + host = lookup_host(name, /* canonicalize = */ 0); + sdb_object_deref(SDB_OBJ(host)); return host != NULL; } /* sdb_store_has_host */ @@ -644,7 +564,7 @@ sdb_store_get_host(const char *name) if (! name) return NULL; - host = lookup_host(name); + host = lookup_host(name, /* canonicalize = */ 0); if (! host) return NULL; @@ -656,6 +576,7 @@ sdb_store_attribute(const char *hostname, const char *key, const sdb_data_t *value, sdb_time_t last_update) { + sdb_host_t *host; sdb_avltree_t *attrs; int status = 0; @@ -663,7 +584,8 @@ sdb_store_attribute(const char *hostname, return -1; pthread_rwlock_wrlock(&host_lock); - attrs = get_host_children(hostname, SDB_ATTRIBUTE); + host = lookup_host(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); @@ -671,9 +593,13 @@ sdb_store_attribute(const char *hostname, } if (! status) - status = store_attr(attrs, key, value, last_update); + status = store_attr(STORE_OBJ(host), attrs, key, value, last_update); + sdb_object_deref(SDB_OBJ(host)); pthread_rwlock_unlock(&host_lock); + + if (sdb_plugin_store_attribute(hostname, key, value, last_update)) + status = -1; return status; } /* sdb_store_attribute */ @@ -681,6 +607,7 @@ int sdb_store_service(const char *hostname, const char *name, sdb_time_t last_update) { + sdb_host_t *host; sdb_avltree_t *services; int status = 0; @@ -689,7 +616,8 @@ sdb_store_service(const char *hostname, const char *name, return -1; pthread_rwlock_wrlock(&host_lock); - services = get_host_children(hostname, SDB_SERVICE); + host = lookup_host(hostname, /* canonicalize = */ 1); + services = get_host_children(host, SDB_SERVICE); if (! services) { sdb_log(SDB_LOG_ERR, "store: Failed to store service '%s' - " "host '%s' not found", name, hostname); @@ -697,8 +625,14 @@ sdb_store_service(const char *hostname, const char *name, } if (! status) - status = store_obj(services, SDB_SERVICE, name, last_update, NULL); + status = store_obj(STORE_OBJ(host), services, SDB_SERVICE, + name, last_update, NULL); + + sdb_object_deref(SDB_OBJ(host)); pthread_rwlock_unlock(&host_lock); + + if (sdb_plugin_store_service(hostname, name, last_update)) + status = -1; return status; } /* sdb_store_service */ @@ -706,15 +640,18 @@ int sdb_store_service_attr(const char *hostname, const char *service, const char *key, const sdb_data_t *value, sdb_time_t last_update) { - sdb_avltree_t *services; + sdb_host_t *host; sdb_service_t *svc; + sdb_avltree_t *services; int status = 0; if ((! hostname) || (! service) || (! key)) return -1; pthread_rwlock_wrlock(&host_lock); - services = get_host_children(hostname, SDB_SERVICE); + host = lookup_host(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", @@ -731,10 +668,15 @@ sdb_store_service_attr(const char *hostname, const char *service, } if (! status) - status = store_attr(svc->attributes, key, value, last_update); + status = store_attr(STORE_OBJ(svc), svc->attributes, + key, value, last_update); sdb_object_deref(SDB_OBJ(svc)); pthread_rwlock_unlock(&host_lock); + + if (sdb_plugin_store_service_attribute(hostname, service, + key, value, last_update)) + status = -1; return status; } /* sdb_store_service_attr */ @@ -743,6 +685,7 @@ sdb_store_metric(const char *hostname, const char *name, sdb_metric_store_t *store, sdb_time_t last_update) { sdb_store_obj_t *obj = NULL; + sdb_host_t *host; sdb_metric_t *metric; sdb_avltree_t *metrics; @@ -751,11 +694,17 @@ sdb_store_metric(const char *hostname, const char *name, if ((! hostname) || (! name)) return -1; - if (store && ((! store->type) || (! store->id))) - return -1; + + if (store) { + if ((store->type != NULL) != (store->id != NULL)) + return -1; + else if (! store->type) + store = NULL; + } pthread_rwlock_wrlock(&host_lock); - metrics = get_host_children(hostname, SDB_METRIC); + host = lookup_host(hostname, /* canonicalize = */ 1); + metrics = get_host_children(host, SDB_METRIC); if (! metrics) { sdb_log(SDB_LOG_ERR, "store: Failed to store metric '%s' - " "host '%s' not found", name, hostname); @@ -763,7 +712,9 @@ sdb_store_metric(const char *hostname, const char *name, } if (! status) - status = store_obj(metrics, SDB_METRIC, name, last_update, &obj); + status = store_obj(STORE_OBJ(host), metrics, SDB_METRIC, + name, last_update, &obj); + sdb_object_deref(SDB_OBJ(host)); if (status || (! store)) { pthread_rwlock_unlock(&host_lock); @@ -793,6 +744,9 @@ sdb_store_metric(const char *hostname, const char *name, status = -1; } pthread_rwlock_unlock(&host_lock); + + if (sdb_plugin_store_metric(hostname, name, store, last_update)) + status = -1; return status; } /* sdb_store_metric */ @@ -801,6 +755,7 @@ 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; + sdb_host_t *host; sdb_metric_t *m; int status = 0; @@ -808,7 +763,9 @@ sdb_store_metric_attr(const char *hostname, const char *metric, return -1; pthread_rwlock_wrlock(&host_lock); - metrics = get_host_children(hostname, SDB_METRIC); + 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 store attribute '%s' " "for metric '%s' - host '%s' not found", @@ -825,18 +782,38 @@ sdb_store_metric_attr(const char *hostname, const char *metric, } if (! status) - status = store_attr(m->attributes, key, value, last_update); + status = store_attr(STORE_OBJ(m), m->attributes, + key, value, last_update); sdb_object_deref(SDB_OBJ(m)); pthread_rwlock_unlock(&host_lock); + + if (sdb_plugin_store_metric_attribute(hostname, metric, + key, value, last_update)) + status = -1; return status; } /* sdb_store_metric_attr */ +sdb_store_obj_t * +sdb_store_get_child(sdb_store_obj_t *host, int type, const char *name) +{ + sdb_avltree_t *children; + + if ((! host) || (host->type != SDB_HOST) || (! name)) + return NULL; + + children = get_host_children(HOST(host), type); + if (! children) + return NULL; + 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; @@ -845,7 +822,9 @@ sdb_store_fetch_timeseries(const char *hostname, const char *metric, return -1; pthread_rwlock_rdlock(&host_lock); - metrics = get_host_children(hostname, SDB_METRIC); + 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); @@ -919,8 +898,18 @@ sdb_store_get_field(sdb_store_obj_t *obj, int field, sdb_data_t *res) tmp.data.datetime = obj->interval; break; case SDB_FIELD_BACKEND: - /* TODO: add support for storing array values in a data object - * for now, fall thru to the error case */ + if (! res) + return 0; + tmp.type = SDB_TYPE_ARRAY | SDB_TYPE_STRING; + tmp.data.array.length = obj->backends_num; + tmp.data.array.values = obj->backends; + return sdb_data_copy(res, &tmp); + case SDB_FIELD_VALUE: + if (obj->type != SDB_ATTRIBUTE) + return -1; + if (! res) + return 0; + return sdb_data_copy(res, &ATTR(obj)->value); default: return -1; } @@ -936,7 +925,7 @@ sdb_store_get_attr(sdb_store_obj_t *obj, const char *name, sdb_data_t *res, sdb_store_matcher_t *filter) { sdb_avltree_t *tree = NULL; - sdb_avltree_iter_t *iter = NULL; + sdb_store_obj_t *attr; if ((! obj) || (! name)) return -1; @@ -951,171 +940,93 @@ sdb_store_get_attr(sdb_store_obj_t *obj, const char *name, sdb_data_t *res, if (! tree) return -1; - iter = sdb_avltree_get_iter(tree); - while (sdb_avltree_iter_has_next(iter)) { - sdb_object_t *attr = sdb_avltree_iter_get_next(iter); - - if (strcasecmp(SDB_OBJ(attr)->name, name)) - continue; - - if (filter&& (! sdb_store_matcher_matches(filter, - STORE_OBJ(attr), NULL))) - break; /* found it but it's filtered */ - - assert(STORE_OBJ(attr)->type == SDB_ATTRIBUTE); - if (res) - sdb_data_copy(res, &ATTR(attr)->value); - sdb_avltree_iter_destroy(iter); - return 0; + attr = STORE_OBJ(sdb_avltree_lookup(tree, name)); + if (! attr) + return -1; + if (filter && (! sdb_store_matcher_matches(filter, attr, NULL))) { + sdb_object_deref(SDB_OBJ(attr)); + return -1; } - sdb_avltree_iter_destroy(iter); - /* not found */ - return -1; + assert(STORE_OBJ(attr)->type == SDB_ATTRIBUTE); + if (res) + sdb_data_copy(res, &ATTR(attr)->value); + sdb_object_deref(SDB_OBJ(attr)); + return 0; } /* sdb_store_get_attr */ int -sdb_store_host_tojson(sdb_store_obj_t *h, sdb_strbuf_t *buf, - sdb_store_matcher_t *filter, int flags) +sdb_store_scan(int type, sdb_store_matcher_t *m, sdb_store_matcher_t *filter, + sdb_store_lookup_cb cb, void *user_data) { - sdb_host_t *host = HOST(h); + sdb_avltree_iter_t *host_iter = NULL; + int status = 0; - if ((! h) || (h->type != SDB_HOST) || (! buf)) + if (! cb) return -1; - /* This function ignores SKIP_EMPTY flags given that the current - * implementation sucks and it's nut currently used when calling this - * function directly. */ - - sdb_strbuf_append(buf, "{\"name\": \"%s\", ", SDB_OBJ(host)->name); - store_common_tojson(h, buf); - - if (! (flags & SDB_SKIP_ATTRIBUTES)) { - sdb_strbuf_append(buf, ", \"attributes\": "); - store_obj_tojson(host->attributes, SDB_ATTRIBUTE, buf, filter, flags); - } - - if (! (flags & SDB_SKIP_METRICS)) { - sdb_strbuf_append(buf, ", \"metrics\": "); - store_obj_tojson(host->metrics, SDB_METRIC, buf, filter, flags); - } - - if (! (flags & SDB_SKIP_SERVICES)) { - sdb_strbuf_append(buf, ", \"services\": "); - store_obj_tojson(host->services, SDB_SERVICE, buf, filter, flags); - } - - sdb_strbuf_append(buf, "}"); - return 0; -} /* sdb_store_host_tojson */ - -static _Bool -has_children(sdb_avltree_t *tree, sdb_store_matcher_t *filter) -{ - sdb_avltree_iter_t *iter; - - if (! filter) - return sdb_avltree_size(tree) > 0; - - iter = sdb_avltree_get_iter(tree); - while (sdb_avltree_iter_has_next(iter)) { - sdb_store_obj_t *sobj = STORE_OBJ(sdb_avltree_iter_get_next(iter)); - if (sdb_store_matcher_matches(filter, sobj, NULL)) { - sdb_avltree_iter_destroy(iter); - return 1; - } - } - sdb_avltree_iter_destroy(iter); - return 0; -} /* has_children */ - -int -sdb_store_tojson(sdb_strbuf_t *buf, sdb_store_matcher_t *filter, int flags) -{ - sdb_avltree_iter_t *host_iter; - size_t len; - - if (! buf) + if ((type != SDB_HOST) && (type != SDB_SERVICE) && (type != SDB_METRIC)) { + sdb_log(SDB_LOG_ERR, "store: Cannot scan objects of type %d", type); return -1; + } pthread_rwlock_rdlock(&host_lock); - host_iter = sdb_avltree_get_iter(hosts); - if (! host_iter) { - pthread_rwlock_unlock(&host_lock); - return -1; + if (hosts) { + host_iter = sdb_avltree_get_iter(hosts); + if (! host_iter) + status = -1; } - sdb_strbuf_append(buf, "["); - - len = sdb_strbuf_len(buf); + /* has_next returns false if the iterator is NULL */ while (sdb_avltree_iter_has_next(host_iter)) { sdb_store_obj_t *host; + sdb_avltree_iter_t *iter = NULL; host = STORE_OBJ(sdb_avltree_iter_get_next(host_iter)); assert(host); - if (filter && (! sdb_store_matcher_matches(filter, host, NULL))) - continue; - - /* - * XXX: This approach sucks but it's the best we can do at the moment. - * In the future, all store lookups should be split into multiple - * steps instead: first, retrieve all relevant objects and apply all - * pre-processing operations and then format it for the wire. - */ - if ((flags & SDB_SKIP_EMPTY_SERVICES) - && (! has_children(HOST(host)->services, filter))) - continue; - if ((flags & SDB_SKIP_EMPTY_METRICS) - && (! has_children(HOST(host)->metrics, filter))) + if (! sdb_store_matcher_matches(filter, host, NULL)) continue; - if (sdb_strbuf_len(buf) > len) - sdb_strbuf_append(buf, ","); - len = sdb_strbuf_len(buf); - - if (sdb_store_host_tojson(host, buf, filter, flags)) - return -1; - } - - sdb_strbuf_append(buf, "]"); - - sdb_avltree_iter_destroy(host_iter); - pthread_rwlock_unlock(&host_lock); - return 0; -} /* sdb_store_tojson */ - -/* TODO: actually support hierarchical data */ -int -sdb_store_iterate(sdb_store_iter_cb cb, void *user_data) -{ - sdb_avltree_iter_t *host_iter; - int status = 0; - - pthread_rwlock_rdlock(&host_lock); - - host_iter = sdb_avltree_get_iter(hosts); - if (! host_iter) - status = -1; - - /* has_next returns false if the iterator is NULL */ - while (sdb_avltree_iter_has_next(host_iter)) { - sdb_store_obj_t *host; - - host = STORE_OBJ(sdb_avltree_iter_get_next(host_iter)); - assert(host); + if (type == SDB_SERVICE) + iter = sdb_avltree_get_iter(HOST(host)->services); + else if (type == SDB_METRIC) + iter = sdb_avltree_get_iter(HOST(host)->metrics); + + if (iter) { + while (sdb_avltree_iter_has_next(iter)) { + sdb_store_obj_t *obj; + obj = STORE_OBJ(sdb_avltree_iter_get_next(iter)); + assert(obj); + + if (sdb_store_matcher_matches(m, obj, filter)) { + if (cb(obj, filter, user_data)) { + sdb_log(SDB_LOG_ERR, "store: Callback returned " + "an error while scanning"); + status = -1; + break; + } + } + } + } + else if (sdb_store_matcher_matches(m, host, filter)) { + if (cb(host, filter, user_data)) { + sdb_log(SDB_LOG_ERR, "store: Callback returned " + "an error while scanning"); + status = -1; + } + } - if (cb(host, user_data)) { - status = -1; + sdb_avltree_iter_destroy(iter); + if (status) break; - } } sdb_avltree_iter_destroy(host_iter); pthread_rwlock_unlock(&host_lock); return status; -} /* sdb_store_iterate */ +} /* sdb_store_scan */ /* vim: set tw=78 sw=4 ts=4 noexpandtab : */