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

libubus: rework buffer allocation code

Browse source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
This commit is contained in:
Felix Fietkau 2014-09-15 15:36:03 +02:00
parent 3e45a782b2
commit 6a285141d9
1 changed files with 31 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
libubus-io.c
View file

@ -231,6 +231,36 @@ static bool ubus_validate_hdr(struct ubus_msghdr *hdr)
return true; return true;
} }
static bool alloc_msg_buf(struct ubus_context *ctx, int len)
{
void *ptr;
int buf_len = ctx->msgbuf_data_len;
int rem;
if (!ctx->msgbuf.data)
buf_len = 0;
rem = (len % UBUS_MSG_CHUNK_SIZE);
if (rem > 0)
len += UBUS_MSG_CHUNK_SIZE - rem;
if (len < buf_len &&
++ctx->msgbuf_reduction_counter > UBUS_MSGBUF_REDUCTION_INTERVAL) {
ctx->msgbuf_reduction_counter = 0;
buf_len = 0;
}
if (len <= buf_len)
return true;
ptr = realloc(ctx->msgbuf.data, len);
if (!ptr)
return false;
ctx->msgbuf.data = ptr;
return true;
}
static bool get_next_msg(struct ubus_context *ctx, int *recv_fd) static bool get_next_msg(struct ubus_context *ctx, int *recv_fd)
{ {
struct { struct {
@ -254,19 +284,7 @@ static bool get_next_msg(struct ubus_context *ctx, int *recv_fd)
return false; return false;
len = blob_raw_len(&hdrbuf.data); len = blob_raw_len(&hdrbuf.data);
if (len > ctx->msgbuf_data_len) if (!alloc_msg_buf(ctx, len))
ctx->msgbuf_reduction_counter = UBUS_MSGBUF_REDUCTION_INTERVAL;
else if (ctx->msgbuf_reduction_counter > 0 && len < UBUS_MSG_CHUNK_SIZE)
len = !--ctx->msgbuf_reduction_counter ? UBUS_MSG_CHUNK_SIZE : -1;
else
len = -1;
if (len > -1) {
ctx->msgbuf.data = realloc(ctx->msgbuf.data, len * sizeof(char));
if (ctx->msgbuf.data)
ctx->msgbuf_data_len = len;
}
if (!ctx->msgbuf.data)
return false; return false;
memcpy(&ctx->msgbuf.hdr, &hdrbuf.hdr, sizeof(hdrbuf.hdr)); memcpy(&ctx->msgbuf.hdr, &hdrbuf.hdr, sizeof(hdrbuf.hdr));