From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtpng2.m.smailru.net (smtpng2.m.smailru.net [94.100.179.3]) (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 91A67445329 for ; Wed, 8 Jul 2020 18:14:29 +0300 (MSK) From: Aleksandr Lyapunov Date: Wed, 8 Jul 2020 18:14:15 +0300 Message-Id: <1594221263-6228-9-git-send-email-alyapunov@tarantool.org> In-Reply-To: <1594221263-6228-1-git-send-email-alyapunov@tarantool.org> References: <1594221263-6228-1-git-send-email-alyapunov@tarantool.org> Subject: [Tarantool-patches] [PATCH 08/16] 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 Cc: v.shpilevoy@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 5fc34f8..0ba86cb 100644 --- a/src/box/txn.c +++ b/src/box/txn.c @@ -37,6 +37,12 @@ #include "errinj.h" #include "iproto_constants.h" +struct tx_manager +{ +}; + +static struct tx_manager txm; + double too_long_threshold; /* Txn cache. */ @@ -978,3 +984,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 b3e7e41..9a50986 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