From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtpng3.m.smailru.net (smtpng3.m.smailru.net [94.100.177.149]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id DF92942EF5D for ; Fri, 3 Jul 2020 09:33:26 +0300 (MSK) Received: by smtpng3.m.smailru.net with esmtpa (envelope-from ) id 1jrFGI-0003jC-G1 for tarantool-patches@dev.tarantool.org; Fri, 03 Jul 2020 09:33:26 +0300 From: Aleksandr Lyapunov Date: Fri, 3 Jul 2020 09:33:10 +0300 Message-Id: <1593757997-4145-9-git-send-email-alyapunov@tarantool.org> In-Reply-To: <1593757997-4145-1-git-send-email-alyapunov@tarantool.org> References: <1593757997-4145-1-git-send-email-alyapunov@tarantool.org> Subject: [Tarantool-patches] [PATCH 08/15] tx: introduce tx manager List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tarantool-patches@dev.tarantool.org --- src/box/txn.c | 16 ++++++++++++++++ src/box/txn.h | 6 ++++++ src/main.cc | 3 +++ 3 files changed, 25 insertions(+) diff --git a/src/box/txn.c b/src/box/txn.c index d1182aa..08293a1 100644 --- a/src/box/txn.c +++ b/src/box/txn.c @@ -36,6 +36,12 @@ #include "xrow.h" #include "errinj.h" +struct tx_manager +{ +}; + +static struct tx_manager txm; + double too_long_threshold; /* Txn cache. */ @@ -953,3 +959,13 @@ txn_on_yield(struct trigger *trigger, void *event) txn_set_flag(txn, TXN_IS_ABORTED_BY_YIELD); return 0; } + +void +tx_manager_init() +{ +} + +void +tx_manager_free() +{ +} diff --git a/src/box/txn.h b/src/box/txn.h index e860e1e..e2194b6 100644 --- a/src/box/txn.h +++ b/src/box/txn.h @@ -636,6 +636,12 @@ box_txn_savepoint(void); API_EXPORT int box_txn_rollback_to_savepoint(box_txn_savepoint_t *savepoint); +void +tx_manager_init(); + +void +tx_manager_free(); + #if defined(__cplusplus) } /* extern "C" */ #endif /* defined(__cplusplus) */ diff --git a/src/main.cc b/src/main.cc index 2c96391..edf6bad 100644 --- a/src/main.cc +++ b/src/main.cc @@ -75,6 +75,7 @@ #include #include "box/lua/init.h" /* box_lua_init() */ #include "box/session.h" +#include "box/txn.h" #include "systemd.h" #include "crypto/crypto.h" #include "core/popen.h" @@ -667,6 +668,7 @@ tarantool_free(void) random_free(); #endif crypto_free(); + tx_manager_free(); coll_free(); systemd_free(); say_logger_free(); @@ -830,6 +832,7 @@ main(int argc, char **argv) signal_init(); cbus_init(); coll_init(); + tx_manager_init(); crypto_init(); systemd_init(); tarantool_lua_init(tarantool_bin, main_argc, main_argv); -- 2.7.4