From: Vladimir Davydov via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH 14/20] net.box: rename netbox_{prepare, encode}_request to {begin, end} Date: Fri, 23 Jul 2021 14:07:24 +0300 [thread overview] Message-ID: <05054979c18e3ca6360277eb415f612131dc569e.1627024646.git.vdavydov@tarantool.org> (raw) In-Reply-To: <cover.1627024646.git.vdavydov@tarantool.org> netbox_encode_request is a confusing name - the function doesn't encode a request, it just writes the actual request size to the fix header. Let's rename the two functions to netbox_begin_request and netbox_end_request to emphasize that they are used to start and finish request encoding. Another reason to do that now is that in the following patches we will be moving the request table implementation from Lua to C so having a "request" in the function names would be confusing. --- src/box/lua/net_box.c | 52 +++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/src/box/lua/net_box.c b/src/box/lua/net_box.c index 12d82738a050..122d69e9219e 100644 --- a/src/box/lua/net_box.c +++ b/src/box/lua/net_box.c @@ -77,10 +77,10 @@ enum netbox_method { }; static inline size_t -netbox_prepare_request(struct mpstream *stream, uint64_t sync, - enum iproto_type type) +netbox_begin_encode(struct mpstream *stream, uint64_t sync, + enum iproto_type type) { - /* Remember initial size of ibuf (see netbox_encode_request()) */ + /* Remember initial size of ibuf (see netbox_end_encode()) */ struct ibuf *ibuf = (struct ibuf *) stream->ctx; size_t used = ibuf_used(ibuf); @@ -103,7 +103,7 @@ netbox_prepare_request(struct mpstream *stream, uint64_t sync, } static inline void -netbox_encode_request(struct mpstream *stream, size_t initial_size) +netbox_end_encode(struct mpstream *stream, size_t initial_size) { mpstream_flush(stream); @@ -135,8 +135,8 @@ netbox_encode_ping(lua_State *L, int idx, struct ibuf *ibuf, uint64_t sync) struct mpstream stream; mpstream_init(&stream, ibuf, ibuf_reserve_cb, ibuf_alloc_cb, luamp_error, L); - size_t svp = netbox_prepare_request(&stream, sync, IPROTO_PING); - netbox_encode_request(&stream, svp); + size_t svp = netbox_begin_encode(&stream, sync, IPROTO_PING); + netbox_end_encode(&stream, svp); } static int @@ -152,7 +152,7 @@ netbox_encode_auth(lua_State *L) struct mpstream stream; mpstream_init(&stream, ibuf, ibuf_reserve_cb, ibuf_alloc_cb, luamp_error, L); - size_t svp = netbox_prepare_request(&stream, sync, IPROTO_AUTH); + size_t svp = netbox_begin_encode(&stream, sync, IPROTO_AUTH); size_t user_len; const char *user = lua_tolstring(L, 3, &user_len); @@ -176,7 +176,7 @@ netbox_encode_auth(lua_State *L) mpstream_encode_strn(&stream, scramble, SCRAMBLE_SIZE); } - netbox_encode_request(&stream, svp); + netbox_end_encode(&stream, svp); return 0; } @@ -188,7 +188,7 @@ netbox_encode_call_impl(lua_State *L, int idx, struct ibuf *ibuf, uint64_t sync, struct mpstream stream; mpstream_init(&stream, ibuf, ibuf_reserve_cb, ibuf_alloc_cb, luamp_error, L); - size_t svp = netbox_prepare_request(&stream, sync, type); + size_t svp = netbox_begin_encode(&stream, sync, type); mpstream_encode_map(&stream, 2); @@ -202,7 +202,7 @@ netbox_encode_call_impl(lua_State *L, int idx, struct ibuf *ibuf, uint64_t sync, mpstream_encode_uint(&stream, IPROTO_TUPLE); luamp_encode_tuple(L, cfg, &stream, idx + 1); - netbox_encode_request(&stream, svp); + netbox_end_encode(&stream, svp); } static void @@ -224,7 +224,7 @@ netbox_encode_eval(lua_State *L, int idx, struct ibuf *ibuf, uint64_t sync) struct mpstream stream; mpstream_init(&stream, ibuf, ibuf_reserve_cb, ibuf_alloc_cb, luamp_error, L); - size_t svp = netbox_prepare_request(&stream, sync, IPROTO_EVAL); + size_t svp = netbox_begin_encode(&stream, sync, IPROTO_EVAL); mpstream_encode_map(&stream, 2); @@ -238,7 +238,7 @@ netbox_encode_eval(lua_State *L, int idx, struct ibuf *ibuf, uint64_t sync) mpstream_encode_uint(&stream, IPROTO_TUPLE); luamp_encode_tuple(L, cfg, &stream, idx + 1); - netbox_encode_request(&stream, svp); + netbox_end_encode(&stream, svp); } static void @@ -248,7 +248,7 @@ netbox_encode_select(lua_State *L, int idx, struct ibuf *ibuf, uint64_t sync) struct mpstream stream; mpstream_init(&stream, ibuf, ibuf_reserve_cb, ibuf_alloc_cb, luamp_error, L); - size_t svp = netbox_prepare_request(&stream, sync, IPROTO_SELECT); + size_t svp = netbox_begin_encode(&stream, sync, IPROTO_SELECT); mpstream_encode_map(&stream, 6); @@ -282,7 +282,7 @@ netbox_encode_select(lua_State *L, int idx, struct ibuf *ibuf, uint64_t sync) mpstream_encode_uint(&stream, IPROTO_KEY); luamp_convert_key(L, cfg, &stream, idx + 5); - netbox_encode_request(&stream, svp); + netbox_end_encode(&stream, svp); } static void @@ -293,7 +293,7 @@ netbox_encode_insert_or_replace(lua_State *L, int idx, struct ibuf *ibuf, struct mpstream stream; mpstream_init(&stream, ibuf, ibuf_reserve_cb, ibuf_alloc_cb, luamp_error, L); - size_t svp = netbox_prepare_request(&stream, sync, type); + size_t svp = netbox_begin_encode(&stream, sync, type); mpstream_encode_map(&stream, 2); @@ -306,7 +306,7 @@ netbox_encode_insert_or_replace(lua_State *L, int idx, struct ibuf *ibuf, mpstream_encode_uint(&stream, IPROTO_TUPLE); luamp_encode_tuple(L, cfg, &stream, idx + 1); - netbox_encode_request(&stream, svp); + netbox_end_encode(&stream, svp); } static void @@ -328,7 +328,7 @@ netbox_encode_delete(lua_State *L, int idx, struct ibuf *ibuf, uint64_t sync) struct mpstream stream; mpstream_init(&stream, ibuf, ibuf_reserve_cb, ibuf_alloc_cb, luamp_error, L); - size_t svp = netbox_prepare_request(&stream, sync, IPROTO_DELETE); + size_t svp = netbox_begin_encode(&stream, sync, IPROTO_DELETE); mpstream_encode_map(&stream, 3); @@ -346,7 +346,7 @@ netbox_encode_delete(lua_State *L, int idx, struct ibuf *ibuf, uint64_t sync) mpstream_encode_uint(&stream, IPROTO_KEY); luamp_convert_key(L, cfg, &stream, idx + 2); - netbox_encode_request(&stream, svp); + netbox_end_encode(&stream, svp); } static void @@ -356,7 +356,7 @@ netbox_encode_update(lua_State *L, int idx, struct ibuf *ibuf, uint64_t sync) struct mpstream stream; mpstream_init(&stream, ibuf, ibuf_reserve_cb, ibuf_alloc_cb, luamp_error, L); - size_t svp = netbox_prepare_request(&stream, sync, IPROTO_UPDATE); + size_t svp = netbox_begin_encode(&stream, sync, IPROTO_UPDATE); mpstream_encode_map(&stream, 5); @@ -382,7 +382,7 @@ netbox_encode_update(lua_State *L, int idx, struct ibuf *ibuf, uint64_t sync) mpstream_encode_uint(&stream, IPROTO_TUPLE); luamp_encode_tuple(L, cfg, &stream, idx + 3); - netbox_encode_request(&stream, svp); + netbox_end_encode(&stream, svp); } static void @@ -392,7 +392,7 @@ netbox_encode_upsert(lua_State *L, int idx, struct ibuf *ibuf, uint64_t sync) struct mpstream stream; mpstream_init(&stream, ibuf, ibuf_reserve_cb, ibuf_alloc_cb, luamp_error, L); - size_t svp = netbox_prepare_request(&stream, sync, IPROTO_UPSERT); + size_t svp = netbox_begin_encode(&stream, sync, IPROTO_UPSERT); mpstream_encode_map(&stream, 4); @@ -413,7 +413,7 @@ netbox_encode_upsert(lua_State *L, int idx, struct ibuf *ibuf, uint64_t sync) mpstream_encode_uint(&stream, IPROTO_OPS); luamp_encode_tuple(L, cfg, &stream, idx + 2); - netbox_encode_request(&stream, svp); + netbox_end_encode(&stream, svp); } static int @@ -631,7 +631,7 @@ netbox_encode_execute(lua_State *L, int idx, struct ibuf *ibuf, uint64_t sync) struct mpstream stream; mpstream_init(&stream, ibuf, ibuf_reserve_cb, ibuf_alloc_cb, luamp_error, L); - size_t svp = netbox_prepare_request(&stream, sync, IPROTO_EXECUTE); + size_t svp = netbox_begin_encode(&stream, sync, IPROTO_EXECUTE); mpstream_encode_map(&stream, 3); @@ -652,7 +652,7 @@ netbox_encode_execute(lua_State *L, int idx, struct ibuf *ibuf, uint64_t sync) mpstream_encode_uint(&stream, IPROTO_OPTIONS); luamp_encode_tuple(L, cfg, &stream, idx + 2); - netbox_encode_request(&stream, svp); + netbox_end_encode(&stream, svp); } static void @@ -662,7 +662,7 @@ netbox_encode_prepare(lua_State *L, int idx, struct ibuf *ibuf, uint64_t sync) struct mpstream stream; mpstream_init(&stream, ibuf, ibuf_reserve_cb, ibuf_alloc_cb, luamp_error, L); - size_t svp = netbox_prepare_request(&stream, sync, IPROTO_PREPARE); + size_t svp = netbox_begin_encode(&stream, sync, IPROTO_PREPARE); mpstream_encode_map(&stream, 1); @@ -677,7 +677,7 @@ netbox_encode_prepare(lua_State *L, int idx, struct ibuf *ibuf, uint64_t sync) mpstream_encode_strn(&stream, query, len); }; - netbox_encode_request(&stream, svp); + netbox_end_encode(&stream, svp); } static void -- 2.25.1
next prev parent reply other threads:[~2021-07-23 11:14 UTC|newest] Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-23 11:07 [Tarantool-patches] [PATCH 00/20] Rewrite performance critical parts of net.box in C Vladimir Davydov via Tarantool-patches 2021-07-23 11:07 ` [Tarantool-patches] [PATCH 01/20] net.box: fix console connection breakage when request is discarded Vladimir Davydov via Tarantool-patches 2021-07-28 22:49 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-29 10:40 ` Vladimir Davydov via Tarantool-patches 2021-07-23 11:07 ` [Tarantool-patches] [PATCH 02/20] net.box: wake up wait_result callers " Vladimir Davydov via Tarantool-patches 2021-07-29 10:47 ` Vladimir Davydov via Tarantool-patches 2021-07-23 11:07 ` [Tarantool-patches] [PATCH 03/20] net.box: do not check worker_fiber in request:result, is_ready Vladimir Davydov via Tarantool-patches 2021-07-23 11:07 ` [Tarantool-patches] [PATCH 04/20] net.box: remove decode_push from method_decoder table Vladimir Davydov via Tarantool-patches 2021-07-23 11:07 ` [Tarantool-patches] [PATCH 05/20] net.box: use decode_tuple instead of decode_get Vladimir Davydov via Tarantool-patches 2021-07-23 11:07 ` [Tarantool-patches] [PATCH 06/20] net.box: rename request.ctx to request.format Vladimir Davydov via Tarantool-patches 2021-07-28 22:49 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-29 10:54 ` Vladimir Davydov via Tarantool-patches 2021-07-29 22:39 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-30 8:15 ` Vladimir Davydov via Tarantool-patches 2021-07-23 11:07 ` [Tarantool-patches] [PATCH 07/20] net.box: use integer id instead of method name Vladimir Davydov via Tarantool-patches 2021-07-28 22:50 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-29 11:30 ` Vladimir Davydov via Tarantool-patches 2021-07-23 11:07 ` [Tarantool-patches] [PATCH 08/20] net.box: remove useless encode optimization Vladimir Davydov via Tarantool-patches 2021-07-23 11:07 ` [Tarantool-patches] [PATCH 09/20] net.box: rewrite request encoder in C Vladimir Davydov via Tarantool-patches 2021-07-28 22:51 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-29 14:08 ` Vladimir Davydov via Tarantool-patches 2021-07-29 14:10 ` Vladimir Davydov via Tarantool-patches 2021-07-23 11:07 ` [Tarantool-patches] [PATCH 10/20] lua/utils: make char ptr Lua CTIDs public Vladimir Davydov via Tarantool-patches 2021-07-23 11:07 ` [Tarantool-patches] [PATCH 11/20] net.box: rewrite response decoder in C Vladimir Davydov via Tarantool-patches 2021-07-27 14:07 ` Cyrill Gorcunov via Tarantool-patches 2021-07-27 14:14 ` Vladimir Davydov via Tarantool-patches 2021-07-29 22:39 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-30 8:44 ` Vladimir Davydov via Tarantool-patches 2021-07-30 22:12 ` Vladislav Shpilevoy via Tarantool-patches 2021-08-02 7:36 ` Vladimir Davydov via Tarantool-patches 2021-07-23 11:07 ` [Tarantool-patches] [PATCH 12/20] net.box: rewrite error " Vladimir Davydov via Tarantool-patches 2021-07-30 22:13 ` Vladislav Shpilevoy via Tarantool-patches 2021-08-02 8:00 ` Vladimir Davydov via Tarantool-patches 2021-08-02 21:47 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-23 11:07 ` [Tarantool-patches] [PATCH 13/20] net.box: rewrite send_and_recv_{iproto, console} " Vladimir Davydov via Tarantool-patches 2021-08-02 21:49 ` Vladislav Shpilevoy via Tarantool-patches 2021-08-03 15:44 ` Vladimir Davydov via Tarantool-patches 2021-08-03 23:06 ` Vladislav Shpilevoy via Tarantool-patches 2021-08-04 13:56 ` Vladimir Davydov via Tarantool-patches 2021-08-04 21:18 ` Vladislav Shpilevoy via Tarantool-patches 2021-08-05 8:37 ` Vladimir Davydov via Tarantool-patches 2021-07-23 11:07 ` Vladimir Davydov via Tarantool-patches [this message] 2021-07-23 11:07 ` [Tarantool-patches] [PATCH 15/20] net.box: rewrite request implementation " Vladimir Davydov via Tarantool-patches 2021-08-02 21:54 ` Vladislav Shpilevoy via Tarantool-patches 2021-08-04 12:30 ` Vladimir Davydov via Tarantool-patches 2021-08-04 15:35 ` Vladimir Davydov via Tarantool-patches 2021-08-04 16:14 ` Vladimir Davydov via Tarantool-patches 2021-08-04 21:20 ` Vladislav Shpilevoy via Tarantool-patches 2021-08-05 12:46 ` Vladimir Davydov via Tarantool-patches 2021-07-23 11:07 ` [Tarantool-patches] [PATCH 16/20] net.box: store next_request_id in C code Vladimir Davydov via Tarantool-patches 2021-08-03 23:06 ` Vladislav Shpilevoy via Tarantool-patches 2021-08-04 16:25 ` Vladimir Davydov via Tarantool-patches 2021-07-23 11:07 ` [Tarantool-patches] [PATCH 17/20] net.box: rewrite console handlers in C Vladimir Davydov via Tarantool-patches 2021-08-03 23:07 ` Vladislav Shpilevoy via Tarantool-patches 2021-08-05 11:53 ` Vladimir Davydov via Tarantool-patches 2021-07-23 11:07 ` [Tarantool-patches] [PATCH 18/20] net.box: rewrite iproto " Vladimir Davydov via Tarantool-patches 2021-08-03 23:08 ` Vladislav Shpilevoy via Tarantool-patches 2021-08-05 11:54 ` Vladimir Davydov via Tarantool-patches 2021-07-23 11:07 ` [Tarantool-patches] [PATCH 19/20] net.box: merge new_id, new_request and encode_method Vladimir Davydov via Tarantool-patches 2021-08-03 23:08 ` Vladislav Shpilevoy via Tarantool-patches 2021-08-05 11:55 ` Vladimir Davydov via Tarantool-patches 2021-07-23 11:07 ` [Tarantool-patches] [PATCH 20/20] net.box: do not create request object in Lua for sync requests Vladimir Davydov via Tarantool-patches 2021-08-03 23:09 ` Vladislav Shpilevoy via Tarantool-patches 2021-08-05 12:23 ` Vladimir Davydov via Tarantool-patches 2021-07-23 12:48 ` [Tarantool-patches] [PATCH 00/20] Rewrite performance critical parts of net.box in C Vladimir Davydov via Tarantool-patches 2021-07-26 7:26 ` Kirill Yukhin via Tarantool-patches 2021-07-27 9:59 ` Vladimir Davydov via Tarantool-patches 2021-07-28 22:51 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-29 11:33 ` Vladimir Davydov via Tarantool-patches 2021-07-29 15:23 ` Vladimir Davydov via Tarantool-patches 2021-07-29 22:38 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-30 10:04 ` Vladimir Davydov via Tarantool-patches 2021-07-29 22:40 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-30 8:16 ` Vladimir Davydov via Tarantool-patches 2021-08-03 23:05 ` Vladislav Shpilevoy via Tarantool-patches 2021-08-04 12:40 ` Vladimir Davydov via Tarantool-patches 2021-08-05 20:59 ` Vladislav Shpilevoy via Tarantool-patches 2021-08-09 11:22 ` Igor Munkin via Tarantool-patches 2021-08-09 11:48 ` Vitaliia Ioffe via Tarantool-patches 2021-08-09 13:56 ` Vladimir Davydov via Tarantool-patches
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=05054979c18e3ca6360277eb415f612131dc569e.1627024646.git.vdavydov@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=vdavydov@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 14/20] net.box: rename netbox_{prepare, encode}_request to {begin, end}' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox