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 2C9CF45C318 for ; Sun, 12 Apr 2020 03:13:57 +0300 (MSK) Received: by smtp50.i.mail.ru with esmtpa (envelope-from ) id 1jNQG4-0005lJ-MD for tarantool-patches@dev.tarantool.org; Sun, 12 Apr 2020 03:13:57 +0300 From: Vladislav Shpilevoy Date: Sun, 12 Apr 2020 02:13:04 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH 23/43] build: export src/main.cc symbols List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tarantool-patches@dev.tarantool.org Exports functions used by src/lua/init.lua via FFI. Part of #2971 --- extra/exports | 2 -- src/exports.c | 2 ++ src/main.cc | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/extra/exports b/extra/exports index 0f068ceac..c6c656c06 100644 --- a/extra/exports +++ b/extra/exports @@ -7,8 +7,6 @@ ibuf_reinit ibuf_destroy ibuf_reserve_slow -tarantool_uptime -tarantool_exit space_by_id space_run_triggers space_bsize diff --git a/src/exports.c b/src/exports.c index 1f9617126..cfb952b01 100644 --- a/src/exports.c +++ b/src/exports.c @@ -54,6 +54,7 @@ EXPORT(crc32_export_syms); EXPORT(csv_export_syms); EXPORT(exception_export_syms); EXPORT(fiber_export_syms); +EXPORT(main_export_syms); EXPORT(PMurHash32_export_syms); EXPORT(port_export_syms); EXPORT(random_export_syms); @@ -75,6 +76,7 @@ export_syms(void) csv_export_syms, exception_export_syms, fiber_export_syms, + main_export_syms, PMurHash32_export_syms, port_export_syms, random_export_syms, diff --git a/src/main.cc b/src/main.cc index 712c70bc0..53e947402 100644 --- a/src/main.cc +++ b/src/main.cc @@ -911,3 +911,13 @@ main(int argc, char **argv) tarantool_free(); return exit_code; } + +extern "C" void ** +main_export_syms(void) +{ + static void *syms[] = { + (void *)tarantool_exit, + (void *)tarantool_uptime, + }; + return syms; +} -- 2.21.1 (Apple Git-122.3)