X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fcore%2Fstore.c;h=e24d2ef0a5356bf0a2badc8aa5fe468f94983a4f;hp=f39f6784a9e788f2606011fcd11115ea1704f5ec;hb=873627f033f749c6dc48293de1183ca4f6961926;hpb=471314c5b8adebd4d1ae0b6f1003122d88b4a298 diff --git a/src/core/store.c b/src/core/store.c index f39f678..e24d2ef 100644 --- a/src/core/store.c +++ b/src/core/store.c @@ -50,15 +50,14 @@ * private variables */ -typedef struct { +struct sdb_store { 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; @@ -75,9 +74,10 @@ static int store_init(sdb_object_t *obj, va_list __attribute__((unused)) ap) { int err; - if (! (ST(obj)->hosts = sdb_avltree_create())) + if (! (SDB_STORE(obj)->hosts = sdb_avltree_create())) return -1; - if ((err = pthread_rwlock_init(&ST(obj)->host_lock, /* attr = */ NULL))) { + if ((err = pthread_rwlock_init(&SDB_STORE(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))); @@ -90,14 +90,14 @@ static void store_destroy(sdb_object_t *obj) { int err; - if ((err = pthread_rwlock_destroy(&ST(obj)->host_lock))) { + if ((err = pthread_rwlock_destroy(&SDB_STORE(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; + sdb_avltree_destroy(SDB_STORE(obj)->hosts); + SDB_STORE(obj)->hosts = NULL; } /* store_destroy */ static int @@ -574,45 +574,25 @@ ts_tojson(sdb_timeseries_t *ts, sdb_strbuf_t *buf) } /* ts_tojson */ /* - * public API + * store writer 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 0; -} /* sdb_store_init */ - -void -sdb_store_clear(void) -{ - if (! global_store) - return; - sdb_avltree_clear(global_store->hosts); -} /* sdb_store_clear */ - -int -sdb_store_attribute(const char *hostname, +static int +store_attribute(const char *hostname, const char *key, const sdb_data_t *value, - sdb_time_t last_update) + sdb_time_t last_update, sdb_object_t *user_data) { + sdb_store_t *st = SDB_STORE(user_data); + sdb_host_t *host; sdb_avltree_t *attrs; int status = 0; - if ((! global_store) || (! hostname) || (! key)) + if ((! hostname) || (! key)) return -1; - pthread_rwlock_wrlock(&global_store->host_lock); - host = lookup_host(global_store, hostname, /* canonicalize = */ 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' - " @@ -624,20 +604,20 @@ sdb_store_attribute(const char *hostname, status = store_attr(STORE_OBJ(host), attrs, key, value, last_update); sdb_object_deref(SDB_OBJ(host)); - pthread_rwlock_unlock(&global_store->host_lock); + pthread_rwlock_unlock(&st->host_lock); - if (sdb_plugin_store_attribute(hostname, key, value, last_update)) - status = -1; return status; -} /* sdb_store_attribute */ +} /* store_attribute */ -int -sdb_store_host(const char *name, sdb_time_t last_update) +static int +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 ((! global_store) || (! name)) + if (! name) return -1; cname = sdb_plugin_cname(strdup(name)); @@ -646,39 +626,39 @@ sdb_store_host(const char *name, sdb_time_t last_update) return -1; } - pthread_rwlock_wrlock(&global_store->host_lock); - status = store_obj(NULL, global_store->hosts, + pthread_rwlock_wrlock(&st->host_lock); + status = store_obj(NULL, st->hosts, SDB_HOST, cname, last_update, NULL); - pthread_rwlock_unlock(&global_store->host_lock); - - if (sdb_plugin_store_host(name, last_update)) - status = -1; + pthread_rwlock_unlock(&st->host_lock); free(cname); return status; -} /* sdb_store_host */ +} /* store_host */ -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_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 = SDB_STORE(user_data); + sdb_host_t *host; sdb_service_t *svc; sdb_avltree_t *services; int status = 0; - if ((! global_store) || (! hostname) || (! service) || (! key)) + if ((! hostname) || (! service) || (! key)) return -1; - pthread_rwlock_wrlock(&global_store->host_lock); - host = lookup_host(global_store, hostname, /* canonicalize = */ 1); + 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(&global_store->host_lock); + pthread_rwlock_unlock(&st->host_lock); return -1; } @@ -694,29 +674,28 @@ sdb_store_service_attr(const char *hostname, const char *service, key, value, last_update); sdb_object_deref(SDB_OBJ(svc)); - pthread_rwlock_unlock(&global_store->host_lock); + 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_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 = SDB_STORE(user_data); + sdb_host_t *host; sdb_avltree_t *services; sdb_data_t d; int status = 0; - if ((! global_store) || (! hostname) || (! name)) + if ((! hostname) || (! name)) return -1; - pthread_rwlock_wrlock(&global_store->host_lock); - host = lookup_host(global_store, 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' - " @@ -729,43 +708,43 @@ sdb_store_service(const char *hostname, const char *name, name, last_update, NULL); sdb_object_deref(SDB_OBJ(host)); - pthread_rwlock_unlock(&global_store->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_metric_attr(const char *hostname, const char *metric, - 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 = SDB_STORE(user_data); + sdb_avltree_t *metrics; sdb_host_t *host; sdb_metric_t *m; int status = 0; - if ((! global_store) || (! hostname) || (! metric) || (! key)) + if ((! hostname) || (! metric) || (! key)) return -1; - pthread_rwlock_wrlock(&global_store->host_lock); - host = lookup_host(global_store, hostname, /* canonicalize = */ 1); + 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 (! 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(&global_store->host_lock); + pthread_rwlock_unlock(&st->host_lock); return -1; } @@ -781,18 +760,18 @@ sdb_store_metric_attr(const char *hostname, const char *metric, key, value, last_update); sdb_object_deref(SDB_OBJ(m)); - pthread_rwlock_unlock(&global_store->host_lock); + pthread_rwlock_unlock(&st->host_lock); - if (sdb_plugin_store_metric_attribute(hostname, metric, - key, value, last_update)) - status = -1; return status; -} /* sdb_store_metric_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 = SDB_STORE(user_data); + sdb_store_obj_t *obj = NULL; sdb_host_t *host; sdb_metric_t *metric; @@ -802,7 +781,7 @@ sdb_store_metric(const char *hostname, const char *name, int status = 0; - if ((! global_store) || (! hostname) || (! name)) + if ((! hostname) || (! name)) return -1; if (store) { @@ -812,8 +791,8 @@ sdb_store_metric(const char *hostname, const char *name, store = NULL; } - pthread_rwlock_wrlock(&global_store->host_lock); - host = lookup_host(global_store, 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' - " @@ -827,7 +806,7 @@ sdb_store_metric(const char *hostname, const char *name, sdb_object_deref(SDB_OBJ(host)); if (status) { - pthread_rwlock_unlock(&global_store->host_lock); + pthread_rwlock_unlock(&st->host_lock); return status; } @@ -837,41 +816,137 @@ sdb_store_metric(const char *hostname, const char *name, if (store) if (store_metric_store(metric, store)) status = -1; - pthread_rwlock_unlock(&global_store->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 */ + +sdb_store_writer_t sdb_store_writer = { + store_host, store_service, store_metric, + 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, + sdb_object_t __attribute__((unused)) *user_data) +{ + return SDB_OBJ(sdb_store_query_prepare(ast)); +} /* prepare_query */ + +static int +execute_query(sdb_object_t *q, + sdb_strbuf_t *buf, sdb_strbuf_t *errbuf, + sdb_object_t *user_data) +{ + return sdb_store_query_execute(SDB_STORE(user_data), + QUERY(q), buf, errbuf); +} /* execute_query */ + +sdb_store_reader_t sdb_store_reader = { + prepare_query, execute_query, +}; + +/* + * public API + */ + +sdb_store_t * +sdb_store_create(void) +{ + return SDB_STORE(sdb_object_create("store", store_type)); +} /* sdb_store_create */ + +int +sdb_store_init(void) +{ + if (global_store) + return 0; + + global_store = SDB_STORE(sdb_object_create("store", store_type)); + if (! global_store) { + sdb_log(SDB_LOG_ERR, "store: Failed to allocate store"); + return -1; + } + if (sdb_plugin_register_writer("memstore", + &sdb_store_writer, SDB_OBJ(global_store))) + return -1; + return sdb_plugin_register_reader("memstore", + &sdb_store_reader, 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(sdb_store_t *store, const char *name, sdb_time_t last_update) +{ + return store_host(name, last_update, SDB_OBJ(store)); +} /* sdb_store_host */ + +int +sdb_store_service(sdb_store_t *store, const char *hostname, const char *name, + sdb_time_t last_update) +{ + return store_service(hostname, name, last_update, SDB_OBJ(store)); +} /* sdb_store_service */ + +int +sdb_store_metric(sdb_store_t *store, const char *hostname, const char *name, + sdb_metric_store_t *metric_store, sdb_time_t last_update) +{ + return store_metric(hostname, name, metric_store, last_update, SDB_OBJ(store)); } /* sdb_store_metric */ -bool -sdb_store_has_host(const char *name) +int +sdb_store_attribute(sdb_store_t *store, const char *hostname, + const char *key, const sdb_data_t *value, sdb_time_t last_update) { - sdb_host_t *host; + return store_attribute(hostname, key, value, last_update, SDB_OBJ(store)); +} /* sdb_store_attribute */ - if ((! global_store) || (! name)) - return false; +int +sdb_store_service_attr(sdb_store_t *store, const char *hostname, + const char *service, const char *key, const sdb_data_t *value, + sdb_time_t last_update) +{ + return store_service_attr(hostname, service, key, value, + last_update, SDB_OBJ(store)); +} /* sdb_store_service_attr */ - host = lookup_host(global_store, name, /* canonicalize = */ 0); - sdb_object_deref(SDB_OBJ(host)); - return host != NULL; -} /* sdb_store_has_host */ +int +sdb_store_metric_attr(sdb_store_t *store, const char *hostname, + const char *metric, const char *key, const sdb_data_t *value, + sdb_time_t last_update) +{ + return store_metric_attr(hostname, metric, key, value, + last_update, SDB_OBJ(store)); +} /* sdb_store_metric_attr */ sdb_store_obj_t * -sdb_store_get_host(const char *name) +sdb_store_get_host(sdb_store_t *store, const char *name) { sdb_host_t *host; - if ((! global_store) || (! name)) + if ((! store) || (! name)) return NULL; - host = lookup_host(global_store, name, /* canonicalize = */ 0); + host = lookup_host(store, name, /* canonicalize = */ 0); if (! host) return NULL; @@ -982,8 +1057,11 @@ sdb_store_get_attr(sdb_store_obj_t *obj, const char *name, sdb_data_t *res, return 0; } /* sdb_store_get_attr */ +/* TODO: sdb_store_fetch_timeseries should move into the plugin module */ + int -sdb_store_fetch_timeseries(const char *hostname, const char *metric, +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; @@ -994,17 +1072,17 @@ sdb_store_fetch_timeseries(const char *hostname, const char *metric, int status = 0; - if ((! global_store) || (! hostname) || (! metric) || (! opts) || (! buf)) + if ((! store) || (! hostname) || (! metric) || (! opts) || (! buf)) return -1; - pthread_rwlock_rdlock(&global_store->host_lock); - host = lookup_host(global_store, hostname, /* canonicalize = */ 1); + pthread_rwlock_rdlock(&store->host_lock); + host = lookup_host(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); + pthread_rwlock_unlock(&store->host_lock); return -1; } @@ -1012,7 +1090,7 @@ sdb_store_fetch_timeseries(const char *hostname, const char *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); + pthread_rwlock_unlock(&store->host_lock); return -1; } @@ -1021,7 +1099,7 @@ sdb_store_fetch_timeseries(const char *hostname, const char *metric, "- no data-store configured for the stored metric", hostname, metric); sdb_object_deref(SDB_OBJ(m)); - pthread_rwlock_unlock(&global_store->host_lock); + pthread_rwlock_unlock(&store->host_lock); return -1; } @@ -1031,7 +1109,7 @@ sdb_store_fetch_timeseries(const char *hostname, const char *metric, strncpy(type, m->store.type, sizeof(type)); strncpy(id, m->store.id, sizeof(id)); - pthread_rwlock_unlock(&global_store->host_lock); + pthread_rwlock_unlock(&store->host_lock); ts = sdb_plugin_fetch_timeseries(type, id, opts); if (! ts) { @@ -1049,13 +1127,14 @@ sdb_store_fetch_timeseries(const char *hostname, const char *metric, } /* sdb_store_fetch_timeseries */ int -sdb_store_scan(int type, sdb_store_matcher_t *m, sdb_store_matcher_t *filter, +sdb_store_scan(sdb_store_t *store, int type, + sdb_store_matcher_t *m, sdb_store_matcher_t *filter, sdb_store_lookup_cb cb, void *user_data) { sdb_avltree_iter_t *host_iter = NULL; int status = 0; - if ((! global_store) || (! cb)) + if ((! store) || (! cb)) return -1; if ((type != SDB_HOST) && (type != SDB_SERVICE) && (type != SDB_METRIC)) { @@ -1063,8 +1142,8 @@ sdb_store_scan(int type, sdb_store_matcher_t *m, sdb_store_matcher_t *filter, return -1; } - pthread_rwlock_rdlock(&global_store->host_lock); - host_iter = sdb_avltree_get_iter(global_store->hosts); + pthread_rwlock_rdlock(&store->host_lock); + host_iter = sdb_avltree_get_iter(store->hosts); if (! host_iter) status = -1; @@ -1114,7 +1193,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(&global_store->host_lock); + pthread_rwlock_unlock(&store->host_lock); return status; } /* sdb_store_scan */