[Tarantool-patches] [PATCH 16/43] build: export src/lib/core/exception.cc symbols

Vladislav Shpilevoy v.shpilevoy at tarantool.org
Sun Apr 12 03:12:56 MSK 2020


Exports functions used by src/lua/error.lua via FFI.

Part of #2971
---
 extra/exports             |  2 --
 src/exports.c             |  2 ++
 src/lib/core/exception.cc | 10 ++++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/extra/exports b/extra/exports
index b15096a57..34c5d2df6 100644
--- a/extra/exports
+++ b/extra/exports
@@ -6,8 +6,6 @@ ibuf_create
 ibuf_reinit
 ibuf_destroy
 ibuf_reserve_slow
-exception_get_string
-exception_get_int
 
 uuid_nil
 tt_uuid_create
diff --git a/src/exports.c b/src/exports.c
index 2d16c175b..fbfde5632 100644
--- a/src/exports.c
+++ b/src/exports.c
@@ -51,6 +51,7 @@
 EXPORT(base64_export_syms);
 EXPORT(clock_export_syms);
 EXPORT(csv_export_syms);
+EXPORT(exception_export_syms);
 EXPORT(fiber_export_syms);
 EXPORT(port_export_syms);
 EXPORT(random_export_syms);
@@ -66,6 +67,7 @@ export_syms(void)
 		base64_export_syms,
 		clock_export_syms,
 		csv_export_syms,
+		exception_export_syms,
 		fiber_export_syms,
 		port_export_syms,
 		random_export_syms,
diff --git a/src/lib/core/exception.cc b/src/lib/core/exception.cc
index 180cb0e97..5b106f354 100644
--- a/src/lib/core/exception.cc
+++ b/src/lib/core/exception.cc
@@ -417,3 +417,13 @@ exception_init()
 }
 
 #undef BuildAlloc
+
+extern "C" void **
+exception_export_syms(void)
+{
+	static void *syms[] = {
+		(void *)exception_get_int,
+		(void *)exception_get_string,
+	};
+	return syms;
+}
-- 
2.21.1 (Apple Git-122.3)



More information about the Tarantool-patches mailing list