X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcore%2Fstore.c;h=16d389c1ab5b535da6b8562256384470fd21e6da;hb=a36367f7760bea8eee3a2e30b7f3e4559f23cc1d;hp=2d32e0d2cdbbb7419c54094d607c3eb771d99a8f;hpb=182112ccd9852672b39ff958ab0c605c9ef856ad;p=sysdb.git

diff --git a/src/core/store.c b/src/core/store.c
index 2d32e0d..16d389c 100644
--- a/src/core/store.c
+++ b/src/core/store.c
@@ -50,17 +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;
+};
 
 /*
  * private types
@@ -75,9 +72,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 +88,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
@@ -582,7 +580,7 @@ store_attribute(const char *hostname,
 		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_store_t *st = SDB_STORE(user_data);
 
 	sdb_host_t *host;
 	sdb_avltree_t *attrs;
@@ -592,7 +590,7 @@ store_attribute(const char *hostname,
 		return -1;
 
 	pthread_rwlock_wrlock(&st->host_lock);
-	host = lookup_host(st, hostname, /* canonicalize = */ 1);
+	host = lookup_host(st, hostname, /* canonicalize = */ 0);
 	attrs = get_host_children(host, SDB_ATTRIBUTE);
 	if (! attrs) {
 		sdb_log(SDB_LOG_ERR, "store: Failed to store attribute '%s' - "
@@ -612,26 +610,17 @@ store_attribute(const char *hostname,
 static int
 store_host(const char *name, sdb_time_t last_update, sdb_object_t *user_data)
 {
-	sdb_store_t *st = ST(user_data);
-
-	char *cname = NULL;
+	sdb_store_t *st = SDB_STORE(user_data);
 	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 */
 
@@ -640,7 +629,7 @@ 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_store_t *st = SDB_STORE(user_data);
 
 	sdb_host_t *host;
 	sdb_service_t *svc;
@@ -651,7 +640,7 @@ store_service_attr(const char *hostname, const char *service,
 		return -1;
 
 	pthread_rwlock_wrlock(&st->host_lock);
-	host = lookup_host(st, hostname, /* canonicalize = */ 1);
+	host = lookup_host(st, hostname, /* canonicalize = */ 0);
 	services = get_host_children(host, SDB_SERVICE);
 	sdb_object_deref(SDB_OBJ(host));
 	if (! services) {
@@ -683,7 +672,7 @@ 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_store_t *st = SDB_STORE(user_data);
 
 	sdb_host_t *host;
 	sdb_avltree_t *services;
@@ -695,7 +684,7 @@ store_service(const char *hostname, const char *name,
 		return -1;
 
 	pthread_rwlock_wrlock(&st->host_lock);
-	host = lookup_host(st, hostname, /* canonicalize = */ 1);
+	host = lookup_host(st, hostname, /* canonicalize = */ 0);
 	services = get_host_children(host, SDB_SERVICE);
 	if (! services) {
 		sdb_log(SDB_LOG_ERR, "store: Failed to store service '%s' - "
@@ -726,7 +715,7 @@ 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_store_t *st = SDB_STORE(user_data);
 
 	sdb_avltree_t *metrics;
 	sdb_host_t *host;
@@ -737,7 +726,7 @@ store_metric_attr(const char *hostname, const char *metric,
 		return -1;
 
 	pthread_rwlock_wrlock(&st->host_lock);
-	host = lookup_host(st, hostname, /* canonicalize = */ 1);
+	host = lookup_host(st, hostname, /* canonicalize = */ 0);
 	metrics = get_host_children(host, SDB_METRIC);
 	sdb_object_deref(SDB_OBJ(host));
 	if (! metrics) {
@@ -770,7 +759,7 @@ 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_t *st = SDB_STORE(user_data);
 
 	sdb_store_obj_t *obj = NULL;
 	sdb_host_t *host;
@@ -792,7 +781,7 @@ store_metric(const char *hostname, const char *name,
 	}
 
 	pthread_rwlock_wrlock(&st->host_lock);
-	host = lookup_host(st, hostname, /* canonicalize = */ 1);
+	host = lookup_host(st, hostname, /* canonicalize = */ 0);
 	metrics = get_host_children(host, SDB_METRIC);
 	if (! metrics) {
 		sdb_log(SDB_LOG_ERR, "store: Failed to store metric '%s' - "
@@ -826,16 +815,11 @@ store_metric(const char *hostname, const char *name,
 	return status;
 } /* store_metric */
 
-static sdb_store_writer_t store_writer = {
+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,
@@ -847,12 +831,13 @@ prepare_query(sdb_ast_node_t *ast,
 static int
 execute_query(sdb_object_t *q,
 		sdb_strbuf_t *buf, sdb_strbuf_t *errbuf,
-		sdb_object_t __attribute__((unused)) *user_data)
+		sdb_object_t *user_data)
 {
-	return sdb_store_query_execute(QUERY(q), buf, errbuf);
+	return sdb_store_query_execute(SDB_STORE(user_data),
+			QUERY(q), buf, errbuf);
 } /* execute_query */
 
-static sdb_store_reader_t store_reader = {
+sdb_store_reader_t sdb_store_reader = {
 	prepare_query, execute_query,
 };
 
@@ -860,38 +845,66 @@ static sdb_store_reader_t store_reader = {
  * 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)
+sdb_store_host(sdb_store_t *store, const char *name, sdb_time_t last_update)
 {
-	if (global_store)
-		return 0;
+	return store_host(name, last_update, SDB_OBJ(store));
+} /* sdb_store_host */
 
-	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 */
+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 */
 
-void
-sdb_store_clear(void)
+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)
 {
-	if (! global_store)
-		return;
-	sdb_avltree_clear(global_store->hosts);
-} /* sdb_store_clear */
+	return store_metric(hostname, name, metric_store, last_update, SDB_OBJ(store));
+} /* sdb_store_metric */
+
+int
+sdb_store_attribute(sdb_store_t *store, const char *hostname,
+		const char *key, const sdb_data_t *value, sdb_time_t last_update)
+{
+	return store_attribute(hostname, key, value, last_update, SDB_OBJ(store));
+} /* sdb_store_attribute */
+
+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 */
+
+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;
 
@@ -1005,7 +1018,8 @@ sdb_store_get_attr(sdb_store_obj_t *obj, const char *name, sdb_data_t *res,
 /* 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;
@@ -1016,17 +1030,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;
 	}
 
@@ -1034,7 +1048,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;
 	}
 
@@ -1043,7 +1057,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;
 	}
 
@@ -1053,7 +1067,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) {
@@ -1071,13 +1085,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)) {
@@ -1085,8 +1100,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;
 
@@ -1136,7 +1151,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 */