From: Alexander Turenko <alexander.turenko@tarantool.org> To: Konstantin Osipov <kostja@tarantool.org> Cc: tarantool-patches@freelists.org, Vladimir Davydov <vdavydov.dev@gmail.com> Subject: Re: [tarantool-patches] [PATCH] iproto: init coio watcher before join/subscribe Date: Thu, 16 May 2019 14:46:53 +0300 [thread overview] Message-ID: <20190516114652.t3vn3tke37cm6wjr@tkn_work_nb> (raw) In-Reply-To: <20190516083817.GN26670@atlas> On Thu, May 16, 2019 at 11:38:17AM +0300, Konstantin Osipov wrote: > * Alexander Turenko <alexander.turenko@tarantool.org> [19/05/16 09:53]: > > box_process_join() and box_process_subscribe() use coio_write_xrow(), > > which calls coio_writev_timeout() under hood. If a socket will block at > > write() the function calls ev_io_start() to wake the fiber up when the > > socket will be ready to write. This code assumes that the watcher > > (struct ev_io) is initialized as coio watcher, i.e. coio_create() has > > been called. > > the same comment is missing from the source code. Looks like it is the contract of box_process_* functions, so I added comments to them. After that the change in iproto.cc is obvious and I think don't requires a comment. See the full patch below. diff --git a/src/box/box.h b/src/box/box.h index 53d88ab71..ddcfbe2e5 100644 --- a/src/box/box.h +++ b/src/box/box.h @@ -172,9 +172,25 @@ box_reset_stat(void); void box_process_auth(struct auth_request *request, const char *salt); +/** + * Join a replica. + * + * Register a replica and feed it with data. + * + * \param io coio watcher (initialized with coio_create()) + * \param JOIN packet header + */ void box_process_join(struct ev_io *io, struct xrow_header *header); +/** + * Subscribe a replica. + * + * Perform necessary checks and start a relay thread. + * + * \param io coio watcher (initialized with coio_create()) + * \param SUBSCRIBE packet header + */ void box_process_subscribe(struct ev_io *io, struct xrow_header *header); diff --git a/src/box/iproto.cc b/src/box/iproto.cc index 02b558ede..8f899fed8 100644 --- a/src/box/iproto.cc +++ b/src/box/iproto.cc @@ -1693,6 +1693,8 @@ tx_process_join_subscribe(struct cmsg *m) { struct iproto_msg *msg = tx_accept_msg(m); struct iproto_connection *con = msg->connection; + struct ev_io io; + coio_create(&io, con->input.fd); try { switch (msg->header.type) { case IPROTO_JOIN: @@ -1701,7 +1703,7 @@ tx_process_join_subscribe(struct cmsg *m) * the lambda in the beginning of the block * will re-activate the watchers for us. */ - box_process_join(&con->input, &msg->header); + box_process_join(&io, &msg->header); break; case IPROTO_SUBSCRIBE: /* @@ -1710,7 +1712,7 @@ tx_process_join_subscribe(struct cmsg *m) * the write watcher will be re-activated * the same way as for JOIN. */ - box_process_subscribe(&con->input, &msg->header); + box_process_subscribe(&io, &msg->header); break; default: unreachable();
next prev parent reply other threads:[~2019-05-16 11:46 UTC|newest] Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-05-15 20:57 Alexander Turenko 2019-05-16 8:38 ` [tarantool-patches] " Konstantin Osipov 2019-05-16 11:46 ` Alexander Turenko [this message] 2019-05-20 9:41 ` Vladimir Davydov 2019-05-20 9:52 ` Vladimir Davydov
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=20190516114652.t3vn3tke37cm6wjr@tkn_work_nb \ --to=alexander.turenko@tarantool.org \ --cc=kostja@tarantool.org \ --cc=tarantool-patches@freelists.org \ --cc=vdavydov.dev@gmail.com \ --subject='Re: [tarantool-patches] [PATCH] iproto: init coio watcher before join/subscribe' \ /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