From: Ilya Kosarev <i.kosarev@tarantool.org>
To: v.shpilevoy@tarantool.org, alyapunov@tarantool.org
Cc: tarantool-patches@dev.tarantool.org
Subject: [Tarantool-patches] [PATCH v6 2/3] iproto: fix comment and add assert on destruction
Date: Sun, 13 Dec 2020 02:38:46 +0300 [thread overview]
Message-ID: <75f56c51e0d888a3b9aee1e8d18367819039face.1607815050.git.i.kosarev@tarantool.org> (raw)
In-Reply-To: <cover.1607815050.git.i.kosarev@tarantool.org>
In-Reply-To: <cover.1607815050.git.i.kosarev@tarantool.org>
The comment in tx_process_destroy() about obuf destroting was wrong.
Memory for them is actually allocated from tx-belonging slab cache and
tx_process_destroy() obviously happens in tx, so the comment is fixed
to reflect the reality.
It is also implied that connection is in IPROTO_CONNECTION_DESTROYED
state in tx_process_destroy(). Now it is verified with assert().
Part of #3776
---
src/box/iproto.cc | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/box/iproto.cc b/src/box/iproto.cc
index 6a1e509225..f7330af21d 100644
--- a/src/box/iproto.cc
+++ b/src/box/iproto.cc
@@ -1379,13 +1379,14 @@ tx_process_destroy(struct cmsg *m)
{
struct iproto_connection *con =
container_of(m, struct iproto_connection, destroy_msg);
+ assert(con->state == IPROTO_CONNECTION_DESTROYED);
if (con->session) {
session_destroy(con->session);
con->session = NULL; /* safety */
}
/*
- * Got to be done in iproto thread since
- * that's where the memory is allocated.
+ * obuf is being destroyed in tx thread cause it is where
+ * it was allocated.
*/
obuf_destroy(&con->obuf[0]);
obuf_destroy(&con->obuf[1]);
--
2.17.1
next prev parent reply other threads:[~2020-12-12 23:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-12 23:38 [Tarantool-patches] [PATCH v6 0/3] iproto: greeting enhancement Ilya Kosarev
2020-12-12 23:38 ` [Tarantool-patches] [PATCH v6 1/3] iproto: move msg fields initialization to iproto_msg_new() Ilya Kosarev
2020-12-12 23:38 ` Ilya Kosarev [this message]
2020-12-12 23:38 ` [Tarantool-patches] [PATCH v6 3/3] iproto: move greeting from tx thread to iproto Ilya Kosarev
2020-12-15 23:04 ` Vladislav Shpilevoy
2020-12-19 17:41 ` Ilya Kosarev
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=75f56c51e0d888a3b9aee1e8d18367819039face.1607815050.git.i.kosarev@tarantool.org \
--to=i.kosarev@tarantool.org \
--cc=alyapunov@tarantool.org \
--cc=tarantool-patches@dev.tarantool.org \
--cc=v.shpilevoy@tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH v6 2/3] iproto: fix comment and add assert on destruction' \
/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