X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=libubus-req.c;h=8475dc9abf1514a4f90f030d1051f0032b27a6c6;hp=43a5c265d7c5c7ff42b6a1b32e310d9176760d6a;hb=af63ab64af10798468ca1453de2360fcda44aab9;hpb=f72dca720bb50d45b1b01bab5b01cb80c78c5230 diff --git a/libubus-req.c b/libubus-req.c index 43a5c26..8475dc9 100644 --- a/libubus-req.c +++ b/libubus-req.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2012 Felix Fietkau + * Copyright (C) 2011-2014 Felix Fietkau * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License version 2.1 @@ -11,6 +11,7 @@ * GNU General Public License for more details. */ +#include #include "libubus.h" #include "libubus-internal.h" @@ -61,7 +62,7 @@ int __hidden ubus_start_request(struct ubus_context *ctx, struct ubus_request *r req->ctx = ctx; req->peer = peer; 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, -1); } void ubus_abort_request(struct ubus_context *ctx, struct ubus_request *req) @@ -113,38 +114,32 @@ static void ubus_sync_req_cb(struct ubus_request *req, int ret) uloop_end(); } -struct ubus_sync_req_cb { - struct uloop_timeout timeout; - struct ubus_request *req; -}; - -static void ubus_sync_req_timeout_cb(struct uloop_timeout *timeout) +static int64_t get_time_msec(void) { - struct ubus_sync_req_cb *cb; + struct timespec ts; + int64_t val; - cb = container_of(timeout, struct ubus_sync_req_cb, timeout); - ubus_set_req_status(cb->req, UBUS_STATUS_TIMEOUT); + clock_gettime(CLOCK_MONOTONIC, &ts); + val = (int64_t) ts.tv_sec * 1000LL; + val += ts.tv_nsec / 1000000LL; + return val; } int ubus_complete_request(struct ubus_context *ctx, struct ubus_request *req, - int timeout) + int req_timeout) { - struct ubus_sync_req_cb cb; ubus_complete_handler_t complete_cb = req->complete_cb; bool registered = ctx->sock.registered; int status = UBUS_STATUS_NO_DATA; + int64_t timeout = 0, time_end = 0; if (!registered) { uloop_init(); ubus_add_uloop(ctx); } - if (timeout) { - memset(&cb, 0, sizeof(cb)); - cb.req = req; - cb.timeout.cb = ubus_sync_req_timeout_cb; - uloop_timeout_set(&cb.timeout, timeout); - } + if (req_timeout) + time_end = get_time_msec() + req_timeout; ubus_complete_request_async(ctx, req); req->complete_cb = ubus_sync_req_cb; @@ -152,17 +147,23 @@ int ubus_complete_request(struct ubus_context *ctx, struct ubus_request *req, ctx->stack_depth++; while (!req->status_msg) { bool cancelled = uloop_cancelled; + uloop_cancelled = false; - uloop_run(); + if (req_timeout) { + timeout = time_end - get_time_msec(); + if (timeout <= 0) { + ubus_set_req_status(req, UBUS_STATUS_TIMEOUT); + break; + } + } + ubus_poll_data(ctx, (unsigned int) timeout); + uloop_cancelled = cancelled; } ctx->stack_depth--; if (ctx->stack_depth) uloop_cancelled = true; - if (timeout) - uloop_timeout_cancel(&cb.timeout); - if (req->status_msg) status = req->status_code; @@ -170,11 +171,12 @@ int ubus_complete_request(struct ubus_context *ctx, struct ubus_request *req, if (req->complete_cb) req->complete_cb(req, status); - if (!registered) + if (!registered) { uloop_fd_delete(&ctx->sock); - if (!ctx->stack_depth) - ubus_process_pending_msg(ctx); + if (ctx->stack_depth) + ctx->pending_timer.cb(&ctx->pending_timer); + } return status; } @@ -184,7 +186,7 @@ void ubus_complete_deferred_request(struct ubus_context *ctx, struct ubus_reques blob_buf_init(&b, 0); blob_put_int32(&b, UBUS_ATTR_STATUS, ret); blob_put_int32(&b, UBUS_ATTR_OBJID, req->object); - ubus_send_msg(ctx, req->seq, b.head, UBUS_MSG_STATUS, req->peer); + ubus_send_msg(ctx, req->seq, b.head, UBUS_MSG_STATUS, req->peer, req->fd); } int ubus_send_reply(struct ubus_context *ctx, struct ubus_request_data *req, @@ -195,7 +197,7 @@ int ubus_send_reply(struct ubus_context *ctx, struct ubus_request_data *req, blob_buf_init(&b, 0); blob_put_int32(&b, UBUS_ATTR_OBJID, req->object); blob_put(&b, UBUS_ATTR_DATA, blob_data(msg), blob_len(msg)); - ret = ubus_send_msg(ctx, req->seq, b.head, UBUS_MSG_DATA, req->peer); + ret = ubus_send_msg(ctx, req->seq, b.head, UBUS_MSG_DATA, req->peer, -1); if (ret < 0) return UBUS_STATUS_NO_DATA; @@ -222,8 +224,12 @@ int ubus_invoke(struct ubus_context *ctx, uint32_t obj, const char *method, int timeout) { struct ubus_request req; + int rc; + + rc = ubus_invoke_async(ctx, obj, method, msg, &req); + if (rc) + return rc; - ubus_invoke_async(ctx, obj, method, msg, &req); req.data_cb = cb; req.priv = priv; return ubus_complete_request(ctx, &req, timeout); @@ -297,7 +303,7 @@ int ubus_notify(struct ubus_context *ctx, struct ubus_object *obj, static bool ubus_get_status(struct ubus_msghdr *hdr, int *ret) { - struct blob_attr **attrbuf = ubus_parse_msg(hdr->data); + struct blob_attr **attrbuf = ubus_parse_msg(ubus_msghdr_data(hdr)); if (!attrbuf[UBUS_ATTR_STATUS]) return false; @@ -321,12 +327,13 @@ ubus_process_req_status(struct ubus_request *req, struct ubus_msghdr *hdr) static void ubus_process_req_data(struct ubus_request *req, struct ubus_msghdr *hdr) { + struct blob_attr *msg_data = ubus_msghdr_data(hdr); struct ubus_pending_data *data; int len; if (!req->blocked) { req->blocked = true; - req_data_cb(req, hdr->type, hdr->data); + req_data_cb(req, hdr->type, msg_data); __ubus_process_req_data(req); req->blocked = false; @@ -336,13 +343,13 @@ ubus_process_req_data(struct ubus_request *req, struct ubus_msghdr *hdr) return; } - len = blob_raw_len(hdr->data); + len = blob_raw_len(msg_data); data = calloc(1, sizeof(*data) + len); if (!data) return; data->type = hdr->type; - memcpy(data->data, hdr->data, len); + memcpy(data->data, msg_data, len); list_add(&data->list, &req->pending); } @@ -403,7 +410,7 @@ static void ubus_process_notify_status(struct ubus_request *req, int id, struct if (!id) { /* first id: ubusd's status message with a list of ids */ - tb = ubus_parse_msg(hdr->data); + tb = ubus_parse_msg(ubus_msghdr_data(hdr)); if (tb[UBUS_ATTR_SUBSCRIBERS]) { blob_for_each_attr(cur, tb[UBUS_ATTR_SUBSCRIBERS], rem) { if (!blob_check_type(blob_data(cur), blob_len(cur), BLOB_ATTR_INT32)) @@ -427,7 +434,7 @@ static void ubus_process_notify_status(struct ubus_request *req, int id, struct ubus_set_req_status(req, 0); } -void __hidden ubus_process_req_msg(struct ubus_context *ctx, struct ubus_msghdr *hdr) +void __hidden ubus_process_req_msg(struct ubus_context *ctx, struct ubus_msghdr *hdr, int fd) { struct ubus_request *req; int id = -1; @@ -438,6 +445,13 @@ void __hidden ubus_process_req_msg(struct ubus_context *ctx, struct ubus_msghdr if (!req) break; + if (fd >= 0) { + if (req->fd_cb) + req->fd_cb(req, fd); + else + close(fd); + } + if (id >= 0) ubus_process_notify_status(req, id, hdr); else