From: Cyrill Gorcunov <gorcunov@gmail.com> To: tml <tarantool-patches@dev.tarantool.org> Subject: [Tarantool-patches] [PATCH v15 03/11] box/txn: move fiber_set_txn to header Date: Fri, 20 Mar 2020 11:19:48 +0300 [thread overview] Message-ID: <20200320081956.30650-4-gorcunov@gmail.com> (raw) In-Reply-To: <20200320081956.30650-1-gorcunov@gmail.com> We will use it inside wal engine. Moreover we already have a "get" function in this header which is named in_txt(). Having both get/set in one place should be more consistent. Acked-by: Konstantin Osipov <kostja.osipov@gmail.com> Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> --- src/box/txn.c | 6 ------ src/box/txn.h | 7 +++++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/box/txn.c b/src/box/txn.c index a4ca48224..6799f6c4b 100644 --- a/src/box/txn.c +++ b/src/box/txn.c @@ -49,12 +49,6 @@ txn_on_yield(struct trigger *trigger, void *event); static void txn_run_rollback_triggers(struct txn *txn, struct rlist *triggers); -static inline void -fiber_set_txn(struct fiber *fiber, struct txn *txn) -{ - fiber->storage.txn = txn; -} - static int txn_add_redo(struct txn *txn, struct txn_stmt *stmt, struct request *request) { diff --git a/src/box/txn.h b/src/box/txn.h index ae2c3a58f..7a7e52954 100644 --- a/src/box/txn.h +++ b/src/box/txn.h @@ -256,6 +256,13 @@ in_txn(void) return fiber()->storage.txn; } +/* Set to the current transaction (if any) */ +static inline void +fiber_set_txn(struct fiber *fiber, struct txn *txn) +{ + fiber->storage.txn = txn; +} + /** * Start a transaction explicitly. * @pre no transaction is active -- 2.20.1
next prev parent reply other threads:[~2020-03-20 8:20 UTC|newest] Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-03-20 8:19 [Tarantool-patches] [PATCH v15 00/11] journal redesign sync and async writes Cyrill Gorcunov 2020-03-20 8:19 ` [Tarantool-patches] [PATCH v15 01/11] box: recovery_journal_create -- set journal here Cyrill Gorcunov 2020-03-20 8:19 ` [Tarantool-patches] [PATCH v15 02/11] box: recovery_journal -- declare it as static Cyrill Gorcunov 2020-03-20 8:19 ` Cyrill Gorcunov [this message] 2020-03-20 10:13 ` [Tarantool-patches] [PATCH v15 03/11] box/txn: move fiber_set_txn to header Konstantin Osipov 2020-03-20 10:17 ` Cyrill Gorcunov 2020-03-20 10:23 ` Konstantin Osipov 2020-03-20 8:19 ` [Tarantool-patches] [PATCH v15 04/11] box/txn: rename txn_write to txn_commit_async Cyrill Gorcunov 2020-03-20 8:19 ` [Tarantool-patches] [PATCH v15 05/11] box/txn: move setup of txn start to txn_prepare Cyrill Gorcunov 2020-03-20 8:19 ` [Tarantool-patches] [PATCH v15 06/11] box/txn: add txn_commit_nop helper Cyrill Gorcunov 2020-03-20 8:19 ` [Tarantool-patches] [PATCH v15 07/11] box/txn: rename txn_entry_complete_cb to txn_complete_async Cyrill Gorcunov 2020-03-20 8:19 ` [Tarantool-patches] [PATCH v15 08/11] box/txn: unweave txn_commit from txn_commit_async Cyrill Gorcunov 2020-03-20 8:34 ` Oleg Babin 2020-03-20 8:46 ` Cyrill Gorcunov 2020-03-20 8:59 ` Cyrill Gorcunov 2020-03-20 8:19 ` [Tarantool-patches] [PATCH v15 09/11] box/txn: clear fiber storage right before journal write Cyrill Gorcunov 2020-03-20 8:19 ` [Tarantool-patches] [PATCH v15 10/11] box/txn: move journal allocation into separate routine Cyrill Gorcunov 2020-03-20 8:19 ` [Tarantool-patches] [PATCH v15 11/11] box/journal: redesign journal operations Cyrill Gorcunov 2020-03-20 10:22 ` Konstantin Osipov 2020-03-20 10:29 ` Cyrill Gorcunov 2020-03-20 10:58 ` Konstantin Osipov 2020-03-20 11:12 ` Cyrill Gorcunov 2020-03-20 13:09 ` Konstantin Osipov 2020-03-20 13:33 ` Cyrill Gorcunov 2020-03-20 13:02 ` [Tarantool-patches] [PATCH v16 " Cyrill Gorcunov 2020-03-20 13:34 ` Konstantin Osipov 2020-03-20 13:58 ` [Tarantool-patches] [PATCH v15 00/11] journal redesign sync and async writes Kirill Yukhin 2020-03-21 19:51 ` Konstantin Osipov 2020-04-08 11:12 ` Kirill Yukhin
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=20200320081956.30650-4-gorcunov@gmail.com \ --to=gorcunov@gmail.com \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v15 03/11] box/txn: move fiber_set_txn to header' \ /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