upgrade mlua

Author: oleggator

Cargo.toml

@@ -13,11 +13,9 @@ libc = "0.2"
 crossbeam-utils = "0.8"
 serde = "1.0"
 
-luajit-src = "=210.5.12"
-
 [dependencies.mlua]
-version = "=0.8.0-beta.3"
-features = ["luajit", "serialize", "vendored"]
+version = "0.11.3"
+features = ["luajit"]
 
 [dependencies.tokio]
 version = "1"

examples/bench/Cargo.toml

@@ -11,8 +11,8 @@ hdrhistogram = "7.5"
 tokio = "1"
 
 [dependencies.mlua]
-version = "=0.8.0-beta.3"
-features = ["luajit", "module", "serialize", "vendored"]
+version = "0.11.3"
+features = ["luajit", "serialize", "module"]
 
 [dependencies.xtm_rust]
 path = "../.."

examples/bench/src/lib.rs

@@ -50,7 +50,7 @@ async fn module_main(dispatcher: Dispatcher<Lua>) {
 }
 
 #[mlua::lua_module]
-fn bench(lua: &Lua) -> LuaResult<LuaTable<'_>> {
+fn bench(lua: &Lua) -> LuaResult<LuaTable> {
     let exports = lua.create_table()?;
 
     exports.set(

examples/grpc/Cargo.toml

@@ -12,8 +12,8 @@ tarantool = { version = "8.0.0", default-features = false }
 uuid = { version = "1.18", features = ["serde", "v4"] }
 
 [dependencies.mlua]
-version = "=0.8.0-beta.3"
-features = ["luajit", "module", "serialize", "vendored"]
+version = "0.11.3"
+features = ["luajit", "serialize", "module"]
 
 [dependencies.xtm_rust]
 path = "../.."

examples/grpc/src/lib.rs

@@ -4,7 +4,7 @@ use mlua::prelude::*;
 use xtm_rust::{ModuleConfig, run_module_with_mlua};
 
 #[mlua::lua_module]
-fn grpc(lua: &Lua) -> LuaResult<LuaTable<'_>> {
+fn grpc(lua: &Lua) -> LuaResult<LuaTable> {
     let exports = lua.create_table()?;
 
     exports.set(

examples/simple/Cargo.toml

@@ -10,8 +10,8 @@ tarantool = { version = "8.0.0", default-features = false }
 serde = "1.0"
 
 [dependencies.mlua]
-version = "=0.8.0-beta.3"
-features = ["luajit", "module", "serialize", "vendored"]
+version = "0.11.3"
+features = ["luajit", "serialize", "module"]
 
 [dependencies.xtm_rust]
 path = "../.."

examples/simple/src/lib.rs

@@ -48,7 +48,7 @@ async fn module_main(dispatcher: Dispatcher<Lua>) {
 }
 
 #[mlua::lua_module]
-fn simple(lua: &Lua) -> LuaResult<LuaTable<'_>> {
+fn simple(lua: &Lua) -> LuaResult<LuaTable> {
     let exports = lua.create_table()?;
 
     exports.set(

src/lib.rs

@@ -39,7 +39,7 @@ where
     Func: Send + FnOnce(Dispatcher<T>) -> Fut,
     Fut: Future,
     Fut::Output: Send,
-    CreateFiber: Fn(Executor<T>) -> tarantool::fiber::JoinHandle<'a, Result<i32, mlua::Error>>,
+    CreateFiber: Fn(Executor<T>) -> tarantool::fiber::JoinHandle<'a, ()>,
 {
     let (dispatcher, executor) = channel(config.buffer)?;
 
@@ -61,37 +61,40 @@ where
                 Ok(rt.block_on(module_main(dispatcher)))
             },
         )?;
+        // yield to start fibers
         tarantool::fiber::sleep(std::time::Duration::ZERO);
 
         for fiber in fibers {
-            let _result = fiber.join().unwrap();
+            fiber.join();
         }
         module_thread.join().unwrap()
     })
     .unwrap()
 }
 
+unsafe extern "C" {
+    unsafe fn luaT_state() -> *mut mlua::lua_State;
+}
+
+unsafe fn mlua_state<'a>() -> &'a mlua::Lua {
+    unsafe { mlua::Lua::get_or_init_from_ptr(luaT_state().cast()) }
+}
+
 fn create_fiber(
-    lua: &Lua,
+    _lua: &Lua,
     max_recv_retries: usize,
     coio_timeout: f64,
     executor: Executor<Lua>,
-) -> tarantool::fiber::JoinHandle<'_, Result<i32, mlua::Error>> {
-    let thread_func = move |lua, ()| loop {
-        match executor.exec(lua, max_recv_retries, coio_timeout) {
-            Ok(()) | Err(ExecError::ResultChannelSendError) => continue,
-            Err(ExecError::TaskChannelRecvError) => break Ok(0),
+) -> tarantool::fiber::JoinHandle<'static, ()> {
+    let func = move || {
+        let lua = unsafe { mlua_state() };
+        loop {
+            match executor.exec(lua, max_recv_retries, coio_timeout) {
+                Ok(()) | Err(ExecError::ResultChannelSendError) => continue,
+                Err(ExecError::TaskChannelRecvError) => break,
+            }
         }
     };
-    let thread_func = lua.create_function(thread_func).unwrap();
-    let thread = lua.create_thread(thread_func).unwrap();
 
-    Fyber::spawn_deferred(
-        "xtm".to_owned(),
-        move || -> std::result::Result<i32, mlua::Error> { thread.resume(()) },
-        true,
-        None,
-    )
-    .unwrap()
-    .unwrap()
+    Fyber::spawn_lua("xtm".to_owned(), func, None).unwrap()
 }