From 3e2925920e3267e4a2d7c2c609f7c7a9d62bb524 Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Thu, 5 Mar 2020 15:29:35 +0300
Subject: [PATCH] box/txn: move fiber_set_txn to header
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 a4ca482244..6799f6c4bb 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 ae2c3a58fe..7a7e529541 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
--
GitLab