From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 28C186EC56; Fri, 23 Jul 2021 14:17:34 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 28C186EC56 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1627039054; bh=gwcuPwT/lOiut+a1sFWf57zMTnTlvZ+CctkQ7yFsSRY=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=LZFHMDRRMDDvrw08ms7hoQVGIMVt8zu3C8hbT4Y4x8nnTsV5OKhwlELxitpAwThMM hHzXgf7qaKc7D3yPiLTbjr42dzO+EFLaI3mQJIKACGTyl2Hn4pRCeQO+lgmBZMR/CV XepqUThqwMvsYs0ay087fGMqTYmuqXwAz9G2DDjM= Received: from smtpng1.i.mail.ru (smtpng1.i.mail.ru [94.100.181.251]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id CBC9E6F87A for ; Fri, 23 Jul 2021 14:08:06 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org CBC9E6F87A Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1m6t2E-0004dl-C4; Fri, 23 Jul 2021 14:08:06 +0300 To: tarantool-patches@dev.tarantool.org Date: Fri, 23 Jul 2021 14:07:30 +0300 Message-Id: <8bd6bfd92d7c62f03f9f4d84a65c5727712c428c.1627024646.git.vdavydov@tarantool.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-174C08C4: 5188C02AEC42908C481ED7ADC579193296BBA28369E3F2D2713F3D5F7D406D31BCF678C7329BA986 X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD941C43E597735A9C386C8E0DDEE7E2465E4A01A82547D9FE1182A05F5380850406A75D38984B6E5235892F6A94C50903EA5495F8FBDE6FB86AFBB1D1FD8FECC9F X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE70312E9A300D47E3BEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006370E2FF649BDAFCC308638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8F3127878A6FF2D25A2D47C74DBD9F4B1117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC55D5BE2F85BDEC5FA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F4460429728776938767073520B1593CA6EC85F86DF04B652EEC242312D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B6045A9A90E9EED90B089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: 8BD88D57C5CADBC8B2710865C3867510A0B4543D0F65078DA3B1A56EE2B804F6B226C914C996894645FD9D8A29397D6EFF55FE49A3C2BFCFC8C84E951CD0BE2F296C473AB1E14218EA052B563B0B06C67866D6147AF826D8F3127878A6FF2D25A2D47C74DBD9F4B1F972CCD2F8FE1EF1CFC4036BBF6A4EA9C7D5A5BACB49E656CB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34ECB3E21D3CD9CB4F7C12DB3839E736C9A70319F515DAF015A3C022749AB30FA93ADEE459AE290C781D7E09C32AA3244CA2249721968EF6A02873915EF42546817101BF96129E4011729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojbL9S8ysBdXiEX0g4jkpDtVxrSgE+wCku X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D10FCF2D992CE1E04C0F9CBC8690A7DAE274CEFED1673C562683ABF942079399BFB559BB5D741EB966A65DFF43FF7BE03240331F90058701C67EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH 20/20] net.box: do not create request object in Lua for sync requests X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Vladimir Davydov via Tarantool-patches Reply-To: Vladimir Davydov Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" It's not really necessary - we can wait for the request to complete in C code, without returning to Lua. Since creating a Lua object puts extra pressure on the garbage collector, we'd better avoid it when we can. --- src/box/lua/net_box.c | 67 +++++++++++++++++++++++++++++------------ src/box/lua/net_box.lua | 39 ++++++++++++++++-------- 2 files changed, 74 insertions(+), 32 deletions(-) diff --git a/src/box/lua/net_box.c b/src/box/lua/net_box.c index 844a1de613f2..684091cf898f 100644 --- a/src/box/lua/net_box.c +++ b/src/box/lua/net_box.c @@ -1610,7 +1610,7 @@ netbox_new_registry(struct lua_State *L) * Writes a request to the send buffer and registers the request object * ('future') that can be used for waiting for a response. * - * Takes the following arguments: + * Takes the following values from Lua stack starting at index idx: * - requests: registry to register the new request with * - send_buf: buffer (ibuf) to write the encoded request to * - buffer: buffer (ibuf) to write the result to or nil @@ -1621,43 +1621,71 @@ netbox_new_registry(struct lua_State *L) * - format: tuple format to use for decoding the body or nil * - ...: method-specific arguments passed to the encoder */ -static int -netbox_perform_async_request(struct lua_State *L) +static void +netbox_perform_async_request_impl(struct lua_State *L, int idx, + struct netbox_request *request) { - struct netbox_request *request = lua_newuserdata(L, sizeof(*request)); - netbox_request_create(request); - luaL_getmetatable(L, netbox_request_typename); - lua_setmetatable(L, -2); - /* Encode and write the request to the send buffer. */ - struct netbox_registry *registry = luaT_check_netbox_registry(L, 1); - struct ibuf *send_buf = (struct ibuf *) lua_topointer(L, 2); - enum netbox_method method = lua_tointeger(L, 5); + struct netbox_registry *registry = luaT_check_netbox_registry(L, idx); + struct ibuf *send_buf = (struct ibuf *) lua_topointer(L, idx + 1); + enum netbox_method method = lua_tointeger(L, idx + 4); assert(method < netbox_method_MAX); uint64_t sync = registry->next_sync++; - netbox_encode_method(L, 9, method, send_buf, sync); + netbox_encode_method(L, idx + 8, method, send_buf, sync); /* Initialize and register the request object. */ request->method = method; request->sync = sync; - request->buffer = (struct ibuf *) lua_topointer(L, 3); - lua_pushvalue(L, 3); + request->buffer = (struct ibuf *) lua_topointer(L, idx + 2); + lua_pushvalue(L, idx + 2); request->buffer_ref = luaL_ref(L, LUA_REGISTRYINDEX); - request->skip_header = lua_toboolean(L, 4); - lua_pushvalue(L, 6); + request->skip_header = lua_toboolean(L, idx + 3); + lua_pushvalue(L, idx + 5); request->on_push_ref = luaL_ref(L, LUA_REGISTRYINDEX); - lua_pushvalue(L, 7); + lua_pushvalue(L, idx + 6); request->on_push_ctx_ref = luaL_ref(L, LUA_REGISTRYINDEX); - if (!lua_isnil(L, 8)) - request->format = lbox_check_tuple_format(L, 8); + if (!lua_isnil(L, idx + 7)) + request->format = lbox_check_tuple_format(L, idx + 7); else request->format = tuple_format_runtime; tuple_format_ref(request->format); if (netbox_request_register(request, registry) != 0) luaT_error(L); +} + +static int +netbox_perform_async_request(struct lua_State *L) +{ + struct netbox_request *request = lua_newuserdata(L, sizeof(*request)); + netbox_request_create(request); + luaL_getmetatable(L, netbox_request_typename); + lua_setmetatable(L, -2); + netbox_perform_async_request_impl(L, 1, request); return 1; } +static int +netbox_perform_request(struct lua_State *L) +{ + double timeout = (!lua_isnil(L, 1) ? + lua_tonumber(L, 1) : TIMEOUT_INFINITY); + struct netbox_request request; + netbox_request_create(&request); + netbox_perform_async_request_impl(L, 2, &request); + while (!netbox_request_is_ready(&request)) { + if (!netbox_request_wait(&request, &timeout)) { + netbox_request_unregister(&request); + netbox_request_destroy(&request); + luaL_testcancel(L); + diag_set(ClientError, ER_TIMEOUT); + return luaT_push_nil_and_error(L); + } + } + int ret = netbox_request_push_result(&request, L); + netbox_request_destroy(&request); + return ret; +} + /* * Given a request registry and a response header, decodes the response and * either completes the request or invokes the on-push trigger, depending on @@ -2028,6 +2056,7 @@ luaopen_net_box(struct lua_State *L) { "decode_greeting",netbox_decode_greeting }, { "new_registry", netbox_new_registry }, { "perform_async_request", netbox_perform_async_request }, + { "perform_request",netbox_perform_request }, { "iproto_auth", netbox_iproto_auth }, { "iproto_schema", netbox_iproto_schema }, { "iproto_loop", netbox_iproto_loop }, diff --git a/src/box/lua/net_box.lua b/src/box/lua/net_box.lua index 55d172a1f6b9..d6367a848aa1 100644 --- a/src/box/lua/net_box.lua +++ b/src/box/lua/net_box.lua @@ -253,19 +253,27 @@ local function create_transport(host, port, user, password, callback, end end - -- - -- Send a request and do not wait for response. - -- @retval nil, error Error occured. - -- @retval not nil Future object. - -- - local function perform_async_request(buffer, skip_header, method, on_push, - on_push_ctx, format, ...) + local function check_active() if state ~= 'active' and state ~= 'fetch_schema' then local code = last_errno or E_NO_CONNECTION local msg = last_error or string.format('Connection is not established, state is "%s"', state) - return nil, box.error.new({code = code, reason = msg}) + return box.error.new({code = code, reason = msg}) + end + return nil + end + + -- + -- Send a request and do not wait for response. + -- @retval nil, error Error occured. + -- @retval not nil Future object. + -- + local function perform_async_request(buffer, skip_header, method, on_push, + on_push_ctx, format, ...) + local err = check_active() + if err then + return nil, err end -- alert worker to notify it of the queued outgoing data; -- if the buffer wasn't empty, assume the worker was already alerted @@ -284,13 +292,18 @@ local function create_transport(host, port, user, password, callback, -- local function perform_request(timeout, buffer, skip_header, method, on_push, on_push_ctx, format, ...) - local request, err = - perform_async_request(buffer, skip_header, method, on_push, - on_push_ctx, format, ...) - if not request then + local err = check_active() + if err then return nil, err end - return request:wait_result(timeout) + -- alert worker to notify it of the queued outgoing data; + -- if the buffer wasn't empty, assume the worker was already alerted + if send_buf:size() == 0 then + worker_fiber:wakeup() + end + return internal.perform_request(timeout, requests, send_buf, buffer, + skip_header, method, on_push, + on_push_ctx, format, ...) end -- PROTOCOL STATE MACHINE (WORKER FIBER) -- -- 2.25.1