From d2bd8f65c678d898b6b7e5e92f76cb4dcce97b3c Mon Sep 17 00:00:00 2001 From: Benoit Germain Date: Mon, 24 Feb 2014 10:13:07 +0100 Subject: Multi-state initialisation issue Fix lookup database table not being created when it should if Lanes is required in more than one Lua master state --- CHANGES | 3 +++ src/lanes.c | 14 +++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CHANGES b/CHANGES index 07f2994..8f777c5 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,8 @@ CHANGES: +CHANGE 103: BGe 24-Feb-14 + * Fix lookup database table not being created when it should if Lanes is required in more than one Lua master state + CHANGE 102: BGe 18-Feb-14 * raise an error instead of dereferencing a NULL pointer on deep userdata creation and lane struct creation diff --git a/src/lanes.c b/src/lanes.c index d6fe170..9f90ff7 100644 --- a/src/lanes.c +++ b/src/lanes.c @@ -3034,10 +3034,6 @@ static int init_once_LOCKED( lua_State* L) lua_insert( L, -2); // Swap key with the Linda object lua_rawset( L, LUA_REGISTRYINDEX); - // we'll need this every time we transfer some C function from/to this state - lua_newtable( L); - lua_setfield( L, LUA_REGISTRYINDEX, LOOKUP_REGKEY); - STACK_END( L, 0); return 0; } @@ -3186,13 +3182,17 @@ LUAG_FUNC( configure) lua_setfield( L, -2, "require"); // settings M lua_pushstring(L, VERSION); // settings M VERSION - lua_setfield(L, -2, "version"); // settings M + lua_setfield( L, -2, "version"); // settings M lua_pushinteger(L, THREAD_PRIO_MAX); // settings M THREAD_PRIO_MAX - lua_setfield(L, -2, "max_prio"); // settings M + lua_setfield( L, -2, "max_prio"); // settings M lua_pushlightuserdata( L, CANCEL_ERROR); // settings M CANCEL_ERROR - lua_setfield(L, -2, "cancel_error"); // settings M + lua_setfield( L, -2, "cancel_error"); // settings M + + // we'll need this every time we transfer some C function from/to this state + lua_newtable( L); + lua_setfield( L, LUA_REGISTRYINDEX, LOOKUP_REGKEY); // register all native functions found in that module in the transferable functions database // we process it before _G because we don't want to find the module when scanning _G (this would generate longer names) -- cgit v1.2.3-55-g6feb