libubus: do not register/unregister with uloop during sync requests

[project/ubus.git] / libubus-req.c

diff --git a/libubus-req.c b/libubus-req.c
index 5180a6f..db5061c 100644 (file)
--- a/libubus-req.c
+++ b/libubus-req.c
@@ -140,15 +140,9 @@ int ubus_complete_request(struct ubus_context *ctx, struct ubus_request *req,
                          int req_timeout)
 {
        ubus_complete_handler_t complete_cb = req->complete_cb;
                          int req_timeout)
 {
        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;
 
        int status = UBUS_STATUS_NO_DATA;
        int64_t timeout = 0, time_end = 0;
 

-       if (!registered) {
-               uloop_init();
-               ubus_add_uloop(ctx);
-       }
-

        if (req_timeout)
                time_end = get_time_msec() + req_timeout;
 
        if (req_timeout)
                time_end = get_time_msec() + req_timeout;
 


@@ -187,12 +181,8 @@ int ubus_complete_request(struct ubus_context *ctx, struct ubus_request *req,
        if (req->complete_cb)
                req->complete_cb(req, status);
 
        if (req->complete_cb)
                req->complete_cb(req, status);
 

-       if (!registered) {
-               uloop_fd_delete(&ctx->sock);
-
-               if (!ctx->stack_depth)
-                       ctx->pending_timer.cb(&ctx->pending_timer);
-       }
+       if (!ctx->stack_depth && !ctx->sock.registered)
+               ctx->pending_timer.cb(&ctx->pending_timer);

 
        return status;
 }
 
        return status;
 }


@@ -220,24 +210,9 @@ int ubus_send_reply(struct ubus_context *ctx, struct ubus_request_data *req,
        return 0;
 }
 
        return 0;
 }
 

-int ubus_invoke_async(struct ubus_context *ctx, uint32_t obj, const char *method,
-                       struct blob_attr *msg, struct ubus_request *req)
-{
-       blob_buf_init(&b, 0);
-       blob_put_int32(&b, UBUS_ATTR_OBJID, obj);
-       blob_put_string(&b, UBUS_ATTR_METHOD, method);
-       if (msg)
-               blob_put(&b, UBUS_ATTR_DATA, blob_data(msg), blob_len(msg));
-
-       if (ubus_start_request(ctx, req, b.head, UBUS_MSG_INVOKE, obj) < 0)
-               return UBUS_STATUS_INVALID_ARGUMENT;
-
-       return 0;
-}
-
-
-int ubus_invoke_async_fd(struct ubus_context *ctx, uint32_t obj, const char *method,
-                       struct blob_attr *msg, struct ubus_request *req, int fd)
+int ubus_invoke_async_fd(struct ubus_context *ctx, uint32_t obj,
+                        const char *method, struct blob_attr *msg,
+                        struct ubus_request *req, int fd)

 {
        blob_buf_init(&b, 0);
        blob_put_int32(&b, UBUS_ATTR_OBJID, obj);
 {
        blob_buf_init(&b, 0);
        blob_put_int32(&b, UBUS_ATTR_OBJID, obj);


@@ -252,25 +227,9 @@ int ubus_invoke_async_fd(struct ubus_context *ctx, uint32_t obj, const char *met
        return 0;
 }
 
        return 0;
 }
 

-int ubus_invoke(struct ubus_context *ctx, uint32_t obj, const char *method,
-                struct blob_attr *msg, ubus_data_handler_t cb, void *priv,
-               int timeout)
-{
-       struct ubus_request req;
-       int rc;
-
-       rc = ubus_invoke_async(ctx, obj, method, msg, &req);
-       if (rc)
-               return rc;
-
-       req.data_cb = cb;
-       req.priv = priv;
-       return ubus_complete_request(ctx, &req, timeout);
-}
-

 int ubus_invoke_fd(struct ubus_context *ctx, uint32_t obj, const char *method,
 int ubus_invoke_fd(struct ubus_context *ctx, uint32_t obj, const char *method,

-                struct blob_attr *msg, ubus_data_handler_t cb, void *priv,
-               int timeout, int fd)
+                  struct blob_attr *msg, ubus_data_handler_t cb, void *priv,
+                  int timeout, int fd)

 {
        struct ubus_request req;
        int rc;
 {
        struct ubus_request req;
        int rc;