From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp50.i.mail.ru (smtp50.i.mail.ru [94.100.177.110]) (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 C100D446429 for ; Sun, 12 Apr 2020 03:14:39 +0300 (MSK) Received: by smtp50.i.mail.ru with esmtpa (envelope-from ) id 1jNQGl-0005lJ-9l for tarantool-patches@dev.tarantool.org; Sun, 12 Apr 2020 03:14:39 +0300 From: Vladislav Shpilevoy Date: Sun, 12 Apr 2020 02:13:16 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH 34/43] build: export src/box/txn.c symbols List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tarantool-patches@dev.tarantool.org Exports functions visible to the public C API and used by src/box/lua/schema.lua via FFI. Part of #2971 --- extra/exports | 8 -------- src/box/txn.c | 16 ++++++++++++++++ src/exports.c | 2 ++ 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/extra/exports b/extra/exports index 1e7a1a49f..515887bcb 100644 --- a/extra/exports +++ b/extra/exports @@ -2,14 +2,6 @@ # Module API -box_txn -box_txn_begin -box_txn_commit -box_txn_savepoint -box_txn_rollback -box_txn_rollback_to_savepoint -box_txn_alloc -box_txn_id box_key_def_new box_key_def_delete box_tuple_format_default diff --git a/src/box/txn.c b/src/box/txn.c index 488aa4bdd..3e2b8cab1 100644 --- a/src/box/txn.c +++ b/src/box/txn.c @@ -941,3 +941,19 @@ txn_on_yield(struct trigger *trigger, void *event) txn_set_flag(txn, TXN_IS_ABORTED_BY_YIELD); return 0; } + +void ** +box_txn_export_syms(void) +{ + static void *syms[] = { + (void *)box_txn, + (void *)box_txn_alloc, + (void *)box_txn_begin, + (void *)box_txn_commit, + (void *)box_txn_id, + (void *)box_txn_rollback, + (void *)box_txn_rollback_to_savepoint, + (void *)box_txn_savepoint, + }; + return syms; +} diff --git a/src/exports.c b/src/exports.c index cd409fae5..bb55ab7fa 100644 --- a/src/exports.c +++ b/src/exports.c @@ -52,6 +52,7 @@ EXPORT(base64_export_syms); EXPORT(box_lua_export_syms); EXPORT(box_schema_export_syms); EXPORT(box_space_export_syms); +EXPORT(box_txn_export_syms); EXPORT(clock_export_syms); EXPORT(coio_export_syms); EXPORT(crc32_export_syms); @@ -81,6 +82,7 @@ export_syms(void) box_lua_export_syms, box_schema_export_syms, box_space_export_syms, + box_txn_export_syms, clock_export_syms, coio_export_syms, crc32_export_syms, -- 2.21.1 (Apple Git-122.3)