Tarantool development patches archive
 help / color / mirror / Atom feed
From: Cyrill Gorcunov <gorcunov@gmail.com>
To: tml <tarantool-patches@dev.tarantool.org>
Subject: [Tarantool-patches] [PATCH 02/10] box/txn: move fiber_set_txn to header
Date: Thu,  5 Mar 2020 15:29:35 +0300	[thread overview]
Message-ID: <20200305122943.7324-3-gorcunov@gmail.com> (raw)
In-Reply-To: <20200305122943.7324-1-gorcunov@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

  parent reply	other threads:[~2020-03-05 12:30 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-05 12:29 [Tarantool-patches] [PATCH 00/10] box/journal: redesign sync and async writes Cyrill Gorcunov
2020-03-05 12:29 ` [Tarantool-patches] [PATCH 01/10] box: recovery_journal_create -- set journal here Cyrill Gorcunov
2020-03-06 21:27   ` Konstantin Osipov
2020-03-05 12:29 ` Cyrill Gorcunov [this message]
2020-03-06 21:27   ` [Tarantool-patches] [PATCH 02/10] box/txn: move fiber_set_txn to header Konstantin Osipov
2020-03-05 12:29 ` [Tarantool-patches] [PATCH 03/10] box/txn: rename txn_write to txn_commit_async Cyrill Gorcunov
2020-03-06 21:28   ` Konstantin Osipov
2020-03-05 12:29 ` [Tarantool-patches] [PATCH 04/10] box/txn: move setup of txn start to txn_prepare Cyrill Gorcunov
2020-03-06 21:30   ` Konstantin Osipov
2020-03-18 12:38     ` Cyrill Gorcunov
2020-03-18 13:58       ` Konstantin Osipov
2020-03-18 14:09         ` Cyrill Gorcunov
2020-03-05 12:29 ` [Tarantool-patches] [PATCH 05/10] box/txn: add txn_commit_nop helper Cyrill Gorcunov
2020-03-06 21:30   ` Konstantin Osipov
2020-03-05 12:29 ` [Tarantool-patches] [PATCH 06/10] box/txn: unweave txn_commit from txn_commit_async Cyrill Gorcunov
2020-03-06 21:33   ` Konstantin Osipov
2020-03-05 12:29 ` [Tarantool-patches] [PATCH 07/10] box/txn: clear fiber storage right before journal write Cyrill Gorcunov
2020-03-06 21:34   ` Konstantin Osipov
2020-03-05 12:29 ` [Tarantool-patches] [PATCH 08/10] box/txn: move journal allocation into separate routine Cyrill Gorcunov
2020-03-06 21:35   ` Konstantin Osipov
2020-03-05 12:29 ` [Tarantool-patches] [PATCH 09/10] box/journal: journal_entry_new -- drop setting up callbacks Cyrill Gorcunov
2020-03-06 21:37   ` Konstantin Osipov
2020-03-06 21:41     ` Cyrill Gorcunov
2020-03-06 21:51       ` Konstantin Osipov
2020-03-06 21:57         ` Cyrill Gorcunov
2020-03-06 22:04           ` Konstantin Osipov
2020-03-05 12:29 ` [Tarantool-patches] [PATCH 10/10] box/journal: redesign sync and async writes Cyrill Gorcunov
2020-03-06 21:48   ` Konstantin Osipov

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=20200305122943.7324-3-gorcunov@gmail.com \
    --to=gorcunov@gmail.com \
    --cc=tarantool-patches@dev.tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH 02/10] 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