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

libubus: always defer processing incoming invoke/unsubscribe/notify if there is a request pending

Browse source 
This fixes recursion problems on config reload in netifd and simplifies
application handling of requests

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
This commit is contained in:
Felix Fietkau 2014-06-24 22:34:50 +02:00
parent 9fda19140e
commit bbd3fbc9cc
4 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libubus-internal.h
View file

@ -26,7 +26,6 @@ int __hidden ubus_start_request(struct ubus_context *ctx, struct ubus_request *r
struct blob_attr *msg, int cmd, uint32_t peer); struct blob_attr *msg, int cmd, uint32_t peer);
void ubus_process_obj_msg(struct ubus_context*ctx, struct ubus_msghdr *hdr); void ubus_process_obj_msg(struct ubus_context*ctx, struct ubus_msghdr *hdr);
void ubus_process_req_msg(struct ubus_context *ctx, struct ubus_msghdr *hdr, int fd); void ubus_process_req_msg(struct ubus_context *ctx, struct ubus_msghdr *hdr, int fd);
void ubus_process_pending_msg(struct ubus_context *ctx);
void __hidden ubus_poll_data(struct ubus_context *ctx, int timeout); void __hidden ubus_poll_data(struct ubus_context *ctx, int timeout);

3
libubus-req.c
View file

@ -174,9 +174,6 @@ int ubus_complete_request(struct ubus_context *ctx, struct ubus_request *req,
if (!registered) if (!registered)
uloop_fd_delete(&ctx->sock); uloop_fd_delete(&ctx->sock);
if (!ctx->stack_depth)
ubus_process_pending_msg(ctx);
return status; return status;
} }

11
libubus.c
View file

@ -81,6 +81,7 @@ ubus_queue_msg(struct ubus_context *ctx, struct ubus_msghdr *hdr)
memcpy(&pending->hdr, hdr, sizeof(*hdr) + blob_raw_len(ubus_msghdr_data(hdr))); memcpy(&pending->hdr, hdr, sizeof(*hdr) + blob_raw_len(ubus_msghdr_data(hdr)));
list_add(&pending->list, &ctx->pending); list_add(&pending->list, &ctx->pending);
uloop_timeout_set(&ctx->pending_timer, 1);
} }
void __hidden void __hidden
@ -96,7 +97,7 @@ ubus_process_msg(struct ubus_context *ctx, struct ubus_msghdr *hdr, int fd)
case UBUS_MSG_INVOKE: case UBUS_MSG_INVOKE:
case UBUS_MSG_UNSUBSCRIBE: case UBUS_MSG_UNSUBSCRIBE:
case UBUS_MSG_NOTIFY: case UBUS_MSG_NOTIFY:
if (ctx->stack_depth > 2) { if (ctx->stack_depth) {
ubus_queue_msg(ctx, hdr); ubus_queue_msg(ctx, hdr);
break; break;
} }
@ -106,17 +107,16 @@ ubus_process_msg(struct ubus_context *ctx, struct ubus_msghdr *hdr, int fd)
} }
} }
void __hidden ubus_process_pending_msg(struct ubus_context *ctx) static void ubus_process_pending_msg(struct uloop_timeout *timeout)
{ {
struct ubus_context *ctx = container_of(timeout, struct ubus_context, pending_timer);
struct ubus_pending_msg *pending; struct ubus_pending_msg *pending;
while (!list_empty(&ctx->pending)) { while (!ctx->stack_depth && !list_empty(&ctx->pending)) {
pending = list_first_entry(&ctx->pending, struct ubus_pending_msg, list); pending = list_first_entry(&ctx->pending, struct ubus_pending_msg, list);
list_del(&pending->list); list_del(&pending->list);
ubus_process_msg(ctx, &pending->hdr, -1); ubus_process_msg(ctx, &pending->hdr, -1);
free(pending); free(pending);
if (ctx->stack_depth > 2)
break;
} }
} }
@ -272,6 +272,7 @@ static int _ubus_connect(struct ubus_context *ctx, const char *path)
ctx->sock.fd = -1; ctx->sock.fd = -1;
ctx->sock.cb = ubus_handle_data; ctx->sock.cb = ubus_handle_data;
ctx->connection_lost = ubus_default_connection_lost; ctx->connection_lost = ubus_default_connection_lost;
ctx->pending_timer.cb = ubus_process_pending_msg;
INIT_LIST_HEAD(&ctx->requests); INIT_LIST_HEAD(&ctx->requests);
INIT_LIST_HEAD(&ctx->pending); INIT_LIST_HEAD(&ctx->pending);

1
libubus.h
View file

@ -140,6 +140,7 @@ struct ubus_context {
struct list_head pending; struct list_head pending;
struct uloop_fd sock; struct uloop_fd sock;
struct uloop_timeout pending_timer;
uint32_t local_id; uint32_t local_id;
uint16_t request_seq; uint16_t request_seq;