5 files changed, 32 insertions, 46 deletions

diff --git a/src/Makefile b/src/Makefile
index 03f5558..a16acce 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,8 +1,8 @@
 #
 # Lanes/src/Makefile
 #
-#   make [LUA=... LUAC=...]                                   Manual build
-#   make LUAROCKS=1 CFLAGS=... LIBFLAG=... LUA=... LUAC=...   LuaRocks automated build
+#   make [LUA=...]                                   Manual build
+#   make LUAROCKS=1 CFLAGS=... LIBFLAG=... LUA=...   LuaRocks automated build
 #
 
 MODULE=lanes
@@ -19,11 +19,10 @@ OPT_FLAGS=-O2
     # -O0 -g
 
 LUA=lua
-LUAC=luac
 
-_SO=.so
+_SO=so
 ifeq "$(findstring MINGW32,$(shell uname -s))" "MINGW32"
-  _SO=.dll
+  _SO=dll
 endif
 
 ifeq "$(LUAROCKS)" ""
@@ -116,32 +115,21 @@ ifeq "$(shell uname -s)" "BSD"
   LIBS += -lpthread
 endif
 
+MODULE_DIR=$(MODULE)
+
 #---
-all: lua51-$(MODULE)$(_SO)
+all: $(MODULE)/core.$(_SO)
 
 %.o: %.c *.h Makefile
 
 # Note: Don't put $(LUA_LIBS) ahead of $^; MSYS will not like that (I think)
 #
-lua51-$(MODULE)$(_SO): $(OBJ)
+$(MODULE_DIR)/core.$(_SO): $(OBJ)
+        mkdir -p $(MODULE_DIR)
         $(CC) $(LIBFLAG) $^ $(LIBS) $(LUA_LIBS) -o $@
 
 clean:
-        -rm -rf lua51-$(MODULE)$(_SO) *.lch *.o *.tmp *.map
-
-lanes.o: keeper.lch
-
-# Note: 'luac -o -' could be used on systems other than Windows (where pipes
-#       are binary). We need to support MinGW as well, so a temporary file.
-#
-# mode 1: embed bytecode version
-#%.lch: %.lua
-#       $(LUAC) -o $@.tmp $<
-#       $(LUA) ../tools/bin2c.lua $@.tmp -o $@
-#       -rm $@.tmp
-# mode 2: embed text version (LuaJIT2-compatible)
-%.lch: %.lua
-        $(LUA) ../tools/bin2c.lua $< -o $@
+        -rm -rf $(MODULE)/core.$(_SO) *.o *.map
 
 #---
 # NSLU2 "slug" Linux ARM
@@ -166,10 +154,9 @@ win32: $(WIN32_LUA51)/include/lua.h
         $(MAKE) build CC=$(MINGW_GCC) \
             LUA_FLAGS=-I$(WIN32_LUA51)/include \
             LUA_LIBS="-L$(WIN32_LUA51) -llua51" \
-            _SO=.dll \
+            _SO=dll \
             SO_FLAGS=-shared \
-            LUA=lua51 \
-            LUAC=luac51
+            LUA=lua51
 
 $(WIN32_LUA51)/include/lua.h:
         @echo "Usage: make win32 WIN32_LUA51=<path of extracted LuaBinaries dll8 and dev packages>"
diff --git a/src/keeper.c b/src/keeper.c
index 6f5bd95..2404520 100644
--- a/src/keeper.c
+++ b/src/keeper.c
@@ -64,12 +64,6 @@ static struct s_Keeper *GKeepers = NULL;
 static int GNbKeepers = 0;
 
 /*
-* Lua code for the keeper states (baked in)
-*/
-static char const keeper_chunk[]= 
-#include "keeper.lch"
-
-/*
 * Initialize keeper states
 *
 * If there is a problem, return an error message (NULL for okay).
@@ -95,26 +89,31 @@ char const* init_keepers( int const _nbKeepers, lua_CFunction _on_state_create)
                 if (!K)
                         return "out of memory";
 
+                STACK_CHECK( K)
                 // to see VM name in Decoda debugger
                 lua_pushliteral( K, "Keeper #");
                 lua_pushinteger( K, i + 1);
                 lua_concat( K, 2);
                 lua_setglobal( K, "decoda_name");
 
-                // Read in the preloaded chunk (and run it)
-                //
-                if( luaL_loadbuffer( K, keeper_chunk, sizeof(keeper_chunk), "@keeper.lua"))
-                        return "luaL_loadbuffer() failed";   // LUA_ERRMEM
-
-                if( lua_pcall( K, 0 /*args*/, 0 /*results*/, 0 /*errfunc*/))
+                // use package.loaders[2] to find keeper microcode
+                lua_getfield( K, LUA_GLOBALSINDEX, "package"); // package
+                lua_getfield( K, -1, "loaders");               // package package.loaders
+                lua_rawgeti( K, -1, 2);                        // package package.loaders package.loaders[2]
+                lua_pushliteral( K, "lanes-keeper");           // package package.loaders package.loaders[2] "lanes-keeper"
+                STACK_MID( K, 4);
+                // first pcall loads lanes-keeper.lua, second one runs the chunk
+                if( lua_pcall( K, 1 /*args*/, 1 /*results*/, 0 /*errfunc*/) || lua_pcall( K, 0 /*args*/, 0 /*results*/, 0 /*errfunc*/))
                 {
                         // LUA_ERRRUN / LUA_ERRMEM / LUA_ERRERR
                         //
                         char const* err = lua_tostring( K, -1);
                         assert( err);
                         return err;
-                }
-
+                }                                              // package package.loaders
+                STACK_MID( K, 2);
+                lua_pop( K, 2);
+                STACK_END( K, 0)
                 MUTEX_INIT( &GKeepers[i].lock_);
                 GKeepers[i].L = K;
                 //GKeepers[i].count = 0;
diff --git a/src/keeper.lua b/src/lanes-keeper.lua
index 1f17599..1f17599 100644
--- a/src/keeper.lua
+++ b/src/lanes-keeper.lua
diff --git a/src/lanes.c b/src/lanes.c
index 3e906c0..300c924 100644
--- a/src/lanes.c
+++ b/src/lanes.c
@@ -51,7 +51,7 @@
  *      ...
  */
 
-char const* VERSION = "3.1.4";
+char const* VERSION = "3.1.5";
 
 /*
 ===============================================================================
@@ -868,7 +868,7 @@ static void linda_id( lua_State *L, char const * const which)
         // in other words, forever.
         lua_pushnil( L);
         // other idfuncs must push a string naming the module they come from
-        //lua_pushliteral( L, "lua51-lanes");
+        //lua_pushliteral( L, "lanes.core");
     }
 }
 
@@ -1697,11 +1697,11 @@ LUAG_FUNC( thread_new )
 
         // modules to require in the target lane *before* the function is transfered!
 
-        //start by requiring lua51-lanes, since it is a bit special
+        //start by requiring lanes.core, since it is a bit special
         // it is not fatal if 'require' isn't loaded, just ignore (may cause function transfer errors later on if the lane pulls the lanes module itself)
         STACK_CHECK(L)
         STACK_CHECK(L2)
-        lua_pushliteral( L, "lua51-lanes");
+        lua_pushliteral( L, "lanes.core");
         require_one_module( L, L2, FALSE);
         lua_pop( L, 1);
         STACK_END(L2,0)
@@ -2510,7 +2510,7 @@ int
 #if (defined PLATFORM_WIN32) || (defined PLATFORM_POCKETPC)
 __declspec(dllexport)
 #endif // (defined PLATFORM_WIN32) || (defined PLATFORM_POCKETPC)
-luaopen_lanes( lua_State *L )
+luaopen_lanes_core( lua_State *L )
 {
         // Create main module interface table
         // we only have 1 closure, which must be called to configure Lanes
diff --git a/src/lanes.lua b/src/lanes.lua
index bd66e6c..8cd3737 100644
--- a/src/lanes.lua
+++ b/src/lanes.lua
@@ -55,10 +55,10 @@ if _params.on_state_create and (type( _params.on_state_create) ~= "function") th
         error( "Bad on_state_create: " .. tostring( _params.on_state_create), 2)
 end
 
-local mm = require "lua51-lanes"
+local mm = require "lanes.core"
 assert( type(mm)=="table" )
 
--- configure() is available only the first time lua51-lanes is required process-wide, and we *must* call it to have the other functions in the interface
+-- configure() is available only the first time lanes.core is required process-wide, and we *must* call it to have the other functions in the interface
 if mm.configure then mm.configure( _params.nb_keepers, _params.on_state_create) end
 
 local thread_new = assert(mm.thread_new)