From 44096a0a342c773bf661f64d37d7c08fc96a68f8 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 31 Jan 2011 03:07:42 +0100
Subject: [PATCH] libubus: keep objects in an avl tree

---
 libubus.c | 20 +++++++++++++++++---
 libubus.h |  9 ++++++---
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/libubus.c b/libubus.c
index b889e5a..e770ce3 100644
--- a/libubus.c
+++ b/libubus.c
@@ -43,6 +43,16 @@ struct ubus_pending_data {
 	struct blob_attr data[];
 };
 
+static int ubus_cmp_id(const void *k1, const void *k2, void *ptr)
+{
+	const uint32_t *id1 = k1, *id2 = k2;
+
+	if (*id1 < *id2)
+		return -1;
+	else
+		return *id1 > *id2;
+}
+
 struct blob_attr **ubus_parse_msg(struct blob_attr *msg)
 {
 	blob_parse(msg, attrbuf, ubus_policy, UBUS_ATTR_MAX);
@@ -97,6 +107,7 @@ int ubus_start_request(struct ubus_context *ctx, struct ubus_request *req,
 
 	INIT_LIST_HEAD(&req->list);
 	INIT_LIST_HEAD(&req->pending);
+	req->ctx = ctx;
 	req->peer = peer;
 	req->seq = ++ctx->request_seq;
 	return ubus_send_msg(ctx, req->seq, msg, cmd, peer);
@@ -394,6 +405,9 @@ static void ubus_publish_cb(struct ubus_request *req, int type, struct blob_attr
 
 	if (attrbuf[UBUS_ATTR_OBJTYPE])
 		obj->type->id = blob_get_int32(attrbuf[UBUS_ATTR_OBJTYPE]);
+
+	obj->avl.key = &obj->id;
+	avl_insert(&req->ctx->objects, &obj->avl);
 }
 
 static bool ubus_push_table_data(const struct ubus_signature **sig, int *rem, bool array)
@@ -464,8 +478,6 @@ int ubus_publish(struct ubus_context *ctx, struct ubus_object *obj)
 
 	blob_buf_init(&b, 0);
 	blob_put_string(&b, UBUS_ATTR_OBJPATH, obj->name);
-	if (obj->parent)
-		blob_put_int32(&b, UBUS_ATTR_OBJID, obj->parent->id);
 
 	if (obj->type->id)
 		blob_put_int32(&b, UBUS_ATTR_OBJTYPE, obj->type->id);
@@ -534,9 +546,11 @@ struct ubus_context *ubus_connect(const char *path)
 	}
 
 	ctx->local_id = hdr.hdr.peer;
-	INIT_LIST_HEAD(&ctx->requests);
 	free(buf);
 
+	INIT_LIST_HEAD(&ctx->requests);
+	avl_init(&ctx->objects, ubus_cmp_id, false, NULL);
+
 	if (!ctx->local_id) {
 		DPRINTF("Failed to get local peer id\n");
 		goto error_close;
diff --git a/libubus.h b/libubus.h
index 9c07cae..2e2f0c6 100644
--- a/libubus.h
+++ b/libubus.h
@@ -1,3 +1,4 @@
+#include <libubox/avl.h>
 #include <libubox/list.h>
 #include <libubox/blobmsg.h>
 #include <libubox/uloop.h>
@@ -52,18 +53,19 @@ struct ubus_object_type {
 };
 
 struct ubus_object {
+	struct avl_node avl;
+
 	const char *name;
 	uint32_t id;
 
 	const char *path;
-	struct ubus_object *parent;
-
 	struct ubus_object_type *type;
 };
 
 struct ubus_context {
 	struct list_head requests;
-	struct list_head objects;
+	struct avl_tree objects;
+
 	struct uloop_fd sock;
 
 	uint32_t local_id;
@@ -96,6 +98,7 @@ struct ubus_request {
 	ubus_data_handler_t data_cb;
 	ubus_complete_handler_t complete_cb;
 
+	struct ubus_context *ctx;
 	void *priv;
 };