libubus: keep objects in an avl tree

[project/ubus.git] / libubus.h

diff --git a/libubus.h b/libubus.h
index 3da5d21..2e2f0c6 100644 (file)
--- 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;
@@ -88,6 +90,7 @@ struct ubus_request {
        bool status_msg;
        int status_code;
        bool blocked;
+       bool cancelled;
 
        uint32_t peer;
        uint32_t seq;
@@ -95,6 +98,7 @@ struct ubus_request {
        ubus_data_handler_t data_cb;
        ubus_complete_handler_t complete_cb;
 
+       struct ubus_context *ctx;
        void *priv;
 };
 
@@ -130,14 +134,10 @@ void ubus_abort_request(struct ubus_context *ctx, struct ubus_request *req);
 /* invoke a method on a specific object */
 int ubus_invoke(struct ubus_context *ctx, uint32_t obj, const char *method,
                 struct blob_attr *msg, ubus_data_handler_t cb, void *priv);
-int ubus_invoke_path(struct ubus_context *ctx, const char *path, const char *method,
-                struct blob_attr *msg, ubus_data_handler_t cb, void *priv);
 
 /* asynchronous version of ubus_invoke() */
 void ubus_invoke_async(struct ubus_context *ctx, uint32_t obj, const char *method,
                        struct blob_attr *msg, struct ubus_request *req);
-void ubus_invoke_path_async(struct ubus_context *ctx, const char *path, const char *method,
-                       struct blob_attr *msg, struct ubus_request *req);
 
 /* make an object visible to remote connections */
 int ubus_publish(struct ubus_context *ctx, struct ubus_object *obj);