DGNum/ubus
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libubus: keep objects in an avl tree

Browse source
This commit is contained in:
Felix Fietkau 2011-01-31 03:07:42 +01:00
parent 749aaf3b6d
commit 44096a0a34
2 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
libubus.c
View file

@ -43,6 +43,16 @@ struct ubus_pending_data {
struct blob_attr 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) struct blob_attr **ubus_parse_msg(struct blob_attr *msg)
{ {
blob_parse(msg, attrbuf, ubus_policy, UBUS_ATTR_MAX); 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->list);
INIT_LIST_HEAD(&req->pending); INIT_LIST_HEAD(&req->pending);
req->ctx = ctx;
req->peer = peer; req->peer = peer;
req->seq = ++ctx->request_seq; req->seq = ++ctx->request_seq;
return ubus_send_msg(ctx, req->seq, msg, cmd, peer); 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]) if (attrbuf[UBUS_ATTR_OBJTYPE])
obj->type->id = blob_get_int32(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) 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_buf_init(&b, 0);
blob_put_string(&b, UBUS_ATTR_OBJPATH, obj->name); 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) if (obj->type->id)
blob_put_int32(&b, UBUS_ATTR_OBJTYPE, 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; ctx->local_id = hdr.hdr.peer;
INIT_LIST_HEAD(&ctx->requests);
free(buf); free(buf);
INIT_LIST_HEAD(&ctx->requests);
avl_init(&ctx->objects, ubus_cmp_id, false, NULL);
if (!ctx->local_id) { if (!ctx->local_id) {
DPRINTF("Failed to get local peer id\n"); DPRINTF("Failed to get local peer id\n");
goto error_close; goto error_close;

9
libubus.h
View file

@ -1,3 +1,4 @@
#include <libubox/avl.h>
#include <libubox/list.h> #include <libubox/list.h>
#include <libubox/blobmsg.h> #include <libubox/blobmsg.h>
#include <libubox/uloop.h> #include <libubox/uloop.h>
@ -52,18 +53,19 @@ struct ubus_object_type {
}; };
struct ubus_object { struct ubus_object {
struct avl_node avl;
const char *name; const char *name;
uint32_t id; uint32_t id;
const char *path; const char *path;
struct ubus_object *parent;
struct ubus_object_type *type; struct ubus_object_type *type;
}; };
struct ubus_context { struct ubus_context {
struct list_head requests; struct list_head requests;
struct list_head objects; struct avl_tree objects;
struct uloop_fd sock; struct uloop_fd sock;
uint32_t local_id; uint32_t local_id;
@ -96,6 +98,7 @@ struct ubus_request {
ubus_data_handler_t data_cb; ubus_data_handler_t data_cb;
ubus_complete_handler_t complete_cb; ubus_complete_handler_t complete_cb;
struct ubus_context *ctx;
void *priv; void *priv;
}; };