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 144E46EC58; Wed, 4 Aug 2021 02:09:55 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 144E46EC58 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1628032195; bh=c4VDC2k06EpkaAAPhBrzAE1/onhYTkeEkhTZpFFhp70=; h=To:References:Date:In-Reply-To:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=H3OJlqgbsQ348XF8FZf529rGaAJwkjp5PFAU7ZS3BxnG0nwruc/5NY0m1d90Oh/Uf d/EXsrffrcBosYyN8ejye0Idr6JCvuVcqsaEBNimwri+j0aAJQJGv3rTz8GKJXWomm RhF6K533GUSlJv5z0fQVnIRrD3e+J8Kpa1BW6mCU= Received: from smtpng2.i.mail.ru (smtpng2.i.mail.ru [94.100.179.3]) (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 31A1A6EC58 for ; Wed, 4 Aug 2021 02:09:54 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 31A1A6EC58 Received: by smtpng2.m.smailru.net with esmtpa (envelope-from ) id 1mB3Xl-0003aq-3z; Wed, 04 Aug 2021 02:09:53 +0300 To: Vladimir Davydov , tarantool-patches@dev.tarantool.org References: <8bd6bfd92d7c62f03f9f4d84a65c5727712c428c.1627024646.git.vdavydov@tarantool.org> Message-ID: Date: Wed, 4 Aug 2021 01:09:52 +0200 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <8bd6bfd92d7c62f03f9f4d84a65c5727712c428c.1627024646.git.vdavydov@tarantool.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD941C43E597735A9C3104FC76DFAAAAF7DA068FE323FAC4379182A05F5380850408180F27ACE851D043947B7EC0928A3E85FDCFF8747F564E1DFF955A1342D70D4 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7F2EC3597058CFA6DEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637351D69ECB1259E308638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8139372298EFFEADBB32A5E49D195CA50117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC2EE5AD8F952D28FBA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18CB629EEF1311BF91D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B613439FA09F3DCB32089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A213B5FB47DCBC3458834459D11680B505E5D277D87C5CA069C374B4D20BA530A3 X-C1DE0DAB: 0D63561A33F958A5E8152FFDF7FF1040FB78CA24FAF33719325B5BACEAA8B8C5D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA751B940EDA0DFB0535410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D341B5517184E88C1BD0EEEEC41326F9FF6B2F1F001B345336A566358399774B1B0A91F3F0E50A900431D7E09C32AA3244C9D0139C7E6D9B69AF3426EF3090B73078580396430872480729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojeDyvyeZJDJFEfpfrQpb3DA== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D6EFE35C23345EA1969C8F04CFF4263D53841015FED1DE5223CC9A89AB576DD93FB559BB5D741EB963CF37A108A312F5C27E8A8C3839CE0E267EA787935ED9F1B X-Mras: Ok Subject: Re: [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: Vladislav Shpilevoy via Tarantool-patches Reply-To: Vladislav Shpilevoy Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Thanks for the patch! See 4 comments below. > 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 > @@ -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) 1. Impl is a confusing name here. Not clear what it does exactly. I propose netbox_make_request() or netbox_send_request() or netbox_push_request() or something likewise. > { > - 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); 2. To avoid most of that diff could you make the index relative from the beginning? Before this commit you could make 'int idx = 1;' and then for each next parameter use 'idx++'. Then this commit wouldn't change much here. > 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); 2. This piece of code is repeated 6 times in the file. Maybe time to make it a function? > + 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; > +} > 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 3. You can drop this return, it does not do anything (given how the function is used). > + end > @@ -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 4. Why not extract it all into a function along with check_active? Such as 'prepare_request()' or something. These blocks until their 'return's are exactly the same. > + return internal.perform_request(timeout, requests, send_buf, buffer, > + skip_header, method, on_push, > + on_push_ctx, format, ...) > end