X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcore%2Fstore.c;h=74cbea2703bdd727aca9011de1861a29b587d58f;hb=ebfd78eb79806777c3de889d75a62665ff78eaca;hp=d9ca4c0eb113a7a2824249d92d83fa45f4d4e56c;hpb=d669467798e5d49acaed756d878fc25fb95875e5;p=sysdb.git

diff --git a/src/core/store.c b/src/core/store.c
index d9ca4c0..74cbea2 100644
--- a/src/core/store.c
+++ b/src/core/store.c
@@ -1091,13 +1091,19 @@ sdb_store_tojson(sdb_strbuf_t *buf, sdb_store_matcher_t *filter, int flags)
 	return 0;
 } /* sdb_store_tojson */
 
-/* TODO: actually support hierarchical data */
 int
-sdb_store_iterate(sdb_store_iter_cb cb, void *user_data)
+sdb_store_scan(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;
 	int status = 0;
 
+	if (! cb)
+		return -1;
+
+	if ((type != SDB_HOST) && (type != SDB_SERVICE) && (type != SDB_METRIC))
+		return -1;
+
 	pthread_rwlock_rdlock(&host_lock);
 
 	host_iter = sdb_avltree_get_iter(hosts);
@@ -1107,20 +1113,47 @@ sdb_store_iterate(sdb_store_iter_cb cb, void *user_data)
 	/* 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 (cb(host, user_data)) {
-			status = -1;
-			break;
+		if (! sdb_store_matcher_matches(filter, host, NULL))
+			continue;
+
+		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, user_data)) {
+						status = -1;
+						break;
+					}
+				}
+			}
+		}
+		else if (sdb_store_matcher_matches(m, host, filter)) {
+			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 : */