michael/mlua
michael
/
mlua
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use main state to store extra data and auxiliary registries

This commit is contained in:
Alex Orlenko 2019-09-30 22:14:58 +01:00
parent 54f4627195
commit 78480b5f31
2 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/lua.rs
View File

@ -17,10 +17,9 @@ use crate::thread::Thread;
use crate::types::{Callback, Integer, LightUserData, LuaRef, Number, RegistryKey}; use crate::types::{Callback, Integer, LightUserData, LuaRef, Number, RegistryKey};
use crate::userdata::{AnyUserData, MetaMethod, UserData, UserDataMethods}; use crate::userdata::{AnyUserData, MetaMethod, UserData, UserDataMethods};
use crate::util::{ use crate::util::{
assert_stack, callback_error, check_stack, get_userdata, get_wrapped_error, assert_stack, callback_error, check_stack, get_main_state, get_userdata, get_wrapped_error,
init_error_registry, init_userdata_metatable, main_state, pop_error, protect_lua, init_error_registry, init_userdata_metatable, pop_error, protect_lua, protect_lua_closure,
protect_lua_closure, push_string, push_userdata, push_wrapped_error, userdata_destructor, push_string, push_userdata, push_wrapped_error, userdata_destructor, StackGuard,
StackGuard,
}; };
use crate::value::{FromLua, FromLuaMulti, MultiValue, Nil, ToLua, ToLuaMulti, Value}; use crate::value::{FromLua, FromLuaMulti, MultiValue, Nil, ToLua, ToLuaMulti, Value};
@ -37,10 +36,11 @@ unsafe impl Send for Lua {}
impl Lua { impl Lua {
/// Constructs a new Lua instance from the existing state. /// Constructs a new Lua instance from the existing state.
pub unsafe fn init_from_ptr(state: *mut ffi::lua_State) -> Lua { pub unsafe fn init_from_ptr(state: *mut ffi::lua_State) -> Lua {
let state_top = ffi::lua_gettop(state); let main_state = get_main_state(state);
let main_state_top = ffi::lua_gettop(state);
let ref_thread = rlua_expect!( let ref_thread = rlua_expect!(
protect_lua_closure(state, 0, 0, |state| { protect_lua_closure(main_state, 0, 0, |state| {
init_error_registry(state); init_error_registry(state);
// Create the function metatable // Create the function metatable
@ -85,17 +85,17 @@ impl Lua {
})); }));
rlua_debug_assert!( rlua_debug_assert!(
ffi::lua_gettop(state) == state_top, ffi::lua_gettop(main_state) == main_state_top,
"stack leak during creation" "stack leak during creation"
); );
assert_stack(state, ffi::LUA_MINSTACK); assert_stack(main_state, ffi::LUA_MINSTACK);
// Place pointer to ExtraData in the lua_State "extra space" // Place pointer to ExtraData in the lua_State "extra space"
*(ffi::lua_getextraspace(state) as *mut *mut ExtraData) = extra; *(ffi::lua_getextraspace(main_state) as *mut *mut ExtraData) = extra;
Lua { Lua {
state, state,
main_state: main_state(state), main_state: main_state,
_no_ref_unwind_safe: PhantomData, _no_ref_unwind_safe: PhantomData,
} }
} }
@ -632,7 +632,7 @@ impl Lua {
Ok(RegistryKey { Ok(RegistryKey {
registry_id, registry_id,
unref_list: (*extra_data(self.state)).registry_unref_list.clone(), unref_list: (*extra_data(self.main_state)).registry_unref_list.clone(),
}) })
} }
} }
@ -692,7 +692,7 @@ impl Lua {
unsafe { unsafe {
Arc::ptr_eq( Arc::ptr_eq(
&key.unref_list, &key.unref_list,
&(*extra_data(self.state)).registry_unref_list, &(*extra_data(self.main_state)).registry_unref_list,
) )
} }
} }
@ -706,7 +706,7 @@ impl Lua {
unsafe { unsafe {
let unref_list = mem::replace( let unref_list = mem::replace(
&mut *rlua_expect!( &mut *rlua_expect!(
(*extra_data(self.state)).registry_unref_list.lock(), (*extra_data(self.main_state)).registry_unref_list.lock(),
"unref list poisoned" "unref list poisoned"
), ),
Some(Vec::new()), Some(Vec::new()),
@ -810,8 +810,7 @@ impl Lua {
ffi::LUA_TUSERDATA => { ffi::LUA_TUSERDATA => {
// It should not be possible to interact with userdata types other than custom // It should not be possible to interact with userdata types other than custom
// UserData types OR a WrappedError. WrappedPanic should never be able to be caught // UserData types OR a WrappedError. WrappedPanic should not be here.
// in lua, so it should never be here.
if let Some(err) = get_wrapped_error(self.state, -1).as_ref() { if let Some(err) = get_wrapped_error(self.state, -1).as_ref() {
let err = err.clone(); let err = err.clone();
ffi::lua_pop(self.state, 1); ffi::lua_pop(self.state, 1);
@ -833,7 +832,7 @@ impl Lua {
lref.lua.main_state == self.main_state, lref.lua.main_state == self.main_state,
"Lua instance passed Value created from a different main Lua state" "Lua instance passed Value created from a different main Lua state"
); );
let extra = extra_data(self.state); let extra = extra_data(self.main_state);
ffi::lua_pushvalue((*extra).ref_thread, lref.index); ffi::lua_pushvalue((*extra).ref_thread, lref.index);
ffi::lua_xmove((*extra).ref_thread, self.state, 1); ffi::lua_xmove((*extra).ref_thread, self.state, 1);
} }
@ -848,7 +847,7 @@ impl Lua {
// number of short term references being created, and `RegistryKey` being used for long term // number of short term references being created, and `RegistryKey` being used for long term
// references. // references.
pub(crate) unsafe fn pop_ref<'lua>(&'lua self) -> LuaRef<'lua> { pub(crate) unsafe fn pop_ref<'lua>(&'lua self) -> LuaRef<'lua> {
let extra = extra_data(self.state); let extra = extra_data(self.main_state);
ffi::lua_xmove(self.state, (*extra).ref_thread, 1); ffi::lua_xmove(self.state, (*extra).ref_thread, 1);
let index = ref_stack_pop(extra); let index = ref_stack_pop(extra);
LuaRef { lua: self, index } LuaRef { lua: self, index }
@ -856,7 +855,7 @@ impl Lua {
pub(crate) fn clone_ref<'lua>(&'lua self, lref: &LuaRef<'lua>) -> LuaRef<'lua> { pub(crate) fn clone_ref<'lua>(&'lua self, lref: &LuaRef<'lua>) -> LuaRef<'lua> {
unsafe { unsafe {
let extra = extra_data(self.state); let extra = extra_data(self.main_state);
ffi::lua_pushvalue((*extra).ref_thread, lref.index); ffi::lua_pushvalue((*extra).ref_thread, lref.index);
let index = ref_stack_pop(extra); let index = ref_stack_pop(extra);
LuaRef { lua: self, index } LuaRef { lua: self, index }
@ -865,7 +864,7 @@ impl Lua {
pub(crate) fn drop_ref<'lua>(&'lua self, lref: &mut LuaRef<'lua>) { pub(crate) fn drop_ref<'lua>(&'lua self, lref: &mut LuaRef<'lua>) {
unsafe { unsafe {
let extra = extra_data(self.state); let extra = extra_data(self.main_state);
ffi::lua_pushnil((*extra).ref_thread); ffi::lua_pushnil((*extra).ref_thread);
ffi::lua_replace((*extra).ref_thread, lref.index); ffi::lua_replace((*extra).ref_thread, lref.index);
(*extra).ref_free.push(lref.index); (*extra).ref_free.push(lref.index);
@ -873,7 +872,7 @@ impl Lua {
} }
pub(crate) unsafe fn userdata_metatable<T: 'static + UserData>(&self) -> Result<c_int> { pub(crate) unsafe fn userdata_metatable<T: 'static + UserData>(&self) -> Result<c_int> {
if let Some(table_id) = (*extra_data(self.state)) if let Some(table_id) = (*extra_data(self.main_state))
.registered_userdata .registered_userdata
.get(&TypeId::of::<T>()) .get(&TypeId::of::<T>())
{ {
@ -919,7 +918,7 @@ impl Lua {
let id = protect_lua_closure(self.state, 1, 0, |state| { let id = protect_lua_closure(self.state, 1, 0, |state| {
ffi::luaL_ref(state, ffi::LUA_REGISTRYINDEX) ffi::luaL_ref(state, ffi::LUA_REGISTRYINDEX)
})?; })?;
(*extra_data(self.state)) (*extra_data(self.main_state))
.registered_userdata .registered_userdata
.insert(TypeId::of::<T>(), id); .insert(TypeId::of::<T>(), id);
Ok(id) Ok(id)
@ -949,7 +948,7 @@ impl Lua {
let lua = Lua { let lua = Lua {
state: state, state: state,
main_state: main_state(state), main_state: get_main_state(state),
_no_ref_unwind_safe: PhantomData, _no_ref_unwind_safe: PhantomData,
}; };

2
src/util.rs
View File

@ -442,7 +442,7 @@ pub unsafe extern "C" fn error_traceback(state: *mut ffi::lua_State) -> c_int {
} }
// Does not call lua_checkstack, uses 1 stack space. // Does not call lua_checkstack, uses 1 stack space.
pub unsafe fn main_state(state: *mut ffi::lua_State) -> *mut ffi::lua_State { pub unsafe fn get_main_state(state: *mut ffi::lua_State) -> *mut ffi::lua_State {
ffi::lua_rawgeti(state, ffi::LUA_REGISTRYINDEX, ffi::LUA_RIDX_MAINTHREAD); ffi::lua_rawgeti(state, ffi::LUA_REGISTRYINDEX, ffi::LUA_RIDX_MAINTHREAD);
let main_state = ffi::lua_tothread(state, -1); let main_state = ffi::lua_tothread(state, -1);
ffi::lua_pop(state, 1); ffi::lua_pop(state, 1);