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

libubus: use calloc_a for queued msgs to reduce the number of allocations

Browse source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
This commit is contained in:
Felix Fietkau 2014-09-15 15:21:40 +02:00
parent 73cbb94b48
commit 7c25c119a5
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libubus.c
View file

@ -74,16 +74,14 @@ static void
ubus_queue_msg(struct ubus_context *ctx, struct ubus_msghdr *hdr)
{
struct ubus_pending_msg *pending;
void *data;
pending = calloc(1, sizeof(*pending));
if (!pending)
return;
pending->hdr.data = calloc(1, blob_raw_len(ubus_msghdr_data(hdr)));
if (!pending->hdr.data)
return;
pending = calloc_a(sizeof(*pending),
&data, blob_raw_len(ubus_msghdr_data(hdr)));
pending->hdr.data = data;
memcpy(&pending->hdr.hdr, hdr, sizeof(*hdr));
memcpy(pending->hdr.data, ubus_msghdr_data(hdr), blob_raw_len(ubus_msghdr_data(hdr)));
memcpy(data, ubus_msghdr_data(hdr), blob_raw_len(ubus_msghdr_data(hdr)));
list_add(&pending->list, &ctx->pending);
if (ctx->sock.registered)
uloop_timeout_set(&ctx->pending_timer, 1);
@ -121,7 +119,6 @@ static void ubus_process_pending_msg(struct uloop_timeout *timeout)
pending = list_first_entry(&ctx->pending, struct ubus_pending_msg, list);
list_del(&pending->list);
ubus_process_msg(ctx, &pending->hdr.hdr, -1);
free(pending->hdr.data);
free(pending);
}
}