* changed lanes.configure signature to receive a table instead of individual parameters

* added support for an on_state_create callback called to load custom functions in a state in addition to the base libraries

31 files changed, 199 insertions, 158 deletions

diff --git a/CHANGES b/CHANGES
index a6ddcfc..b2fe499 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,10 @@ CHANGES:
 
 CHANGE X:
 
+CHANGE 35 BGe 17-Feb-2012
+   * changed lanes.configure signature to receive a table instead of individual parameters
+   * added support for an on_state_create callback called to load custom functions in a state in addition to the base libraries
+
 CHANGE 34 BGe 14-Nov-2011
    * removed packagepath and packagecpath options, replaced by a package table, whose fields path, cpath, loaders, preload are transfered
    * code cleanup to facilitate transition between WIN32 and PTHREAD impleentations
diff --git a/docs/index.html b/docs/index.html
index e24b172..72e91ba 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -56,7 +56,7 @@
 
 <p><br/><font size="-1"><i>Copyright &copy; 2007-12 Asko Kauppi, Benoit Germain. All rights reserved.</i>
     <br>Lua Lanes is published under the same <A HREF="http://en.wikipedia.org/wiki/MIT_License">MIT license</A> as Lua 5.1.
-    </p><p>This document was revised on 5-Nov-11, and applies to version 3.0-beta.
+    </p><p>This document was revised on 17-Feb-11, and applies to version 3.1.0
 </font></p>
 
 </center>
@@ -173,8 +173,7 @@ Or use <A HREF="http://www.luarocks.org" TARGET="_blank">Lua Rocks</A> package m
     <tr>
       <td>
         <pre>
-          local lanes = require "lanes"
-          lanes.configure( 1)
+          local lanes = require "lanes".configure()
         </pre>
       </table>
 
@@ -182,11 +181,11 @@ Or use <A HREF="http://www.luarocks.org" TARGET="_blank">Lua Rocks</A> package m
     Starting with version 3.0-beta, requiring the module follows Lua 5.2 rules:
     the module is not available under the global name "lanes", but has to be accessed
     through require's return value.
-    After lanes is required, it is necessary to call lanes.configure(), which is the
-    only function exposed by the module at this point. Calling configure() will
+    After lanes is required, it is necessary to call <tt>lanes.configure()</tt>, which is the
+    only function exposed by the module at this point. Calling <tt>configure()</tt> will
     perform one-time initializations and make the rest of the API available.
-    At the same time, configure() itself will be replaced by another function that
-    raises an error if called with differing arguments.
+    At the same time, <tt>configure()</tt> itself will be replaced by another function that
+    raises an error if called again with differing arguments.
   </p>
 
   <p>
@@ -194,19 +193,39 @@ Or use <A HREF="http://www.luarocks.org" TARGET="_blank">Lua Rocks</A> package m
       <tr>
         <td>
           <code>
-            lanes.configure( [nb_keepers] [, "NO_TIMERS"])
+            lanes.configure( [opt_tbl])
           </code>
         </table>
   </p>
   <p>
-    <tt>lanes.configure</tt> accepts 2 arguments. The first one controls the number
-    of keeper states used internally by lindas to transfer data between lanes. (see below).
-    Default is 1.
-  </p>
-  <p>If the second argument is equal to <tt>"NO_TIMERS"</tt>, Lanes doesn't start the timer service,
+    <tt>lanes.configure</tt> accepts an optional options table as sole argument.
+  <table>
+    <tr valign=top><td width=40></td><td>
+        <code>.nb_keepers</code> <br/><nobr>N</nobr></td><td width=40></td>
+    <td>
+    Controls the number of keeper states used internally by lindas to transfer data between lanes. (see below). Default is 1.
+    </td></tr>
+
+    <tr valign=top><td/><td>
+        <code>.with_timers</code> <br/>nil/false/anything</td><td/>
+    <td>
+    If equal to <tt>false</tt>, Lanes doesn't start the timer service,
   and the associated API will be absent from the interface (see below).
-  </p>
-  <h2 id="creation">Creation</h2>
+  Any other value (including <tt>nil</tt>), starts the timer service.
+    </td></tr>
+
+    <tr valign="top">
+      <td/>
+      <td>
+        <code>.on_create_state</code> <br/>C function/nil
+      </td><td/>
+      <td>
+        If provided, will be called in every created Lua state (keepers and lanes) right after it is created, and *before* any library is loaded.
+        That way, all C functions it loads in the state can be added to the function lookup database.
+    </td>
+    </tr>
+  </table>
+<h2 id="creation">Creation</h2>
 
 <p>The following sample shows preparing a function for parallel calling, and
 calling it with varying arguments. Each of the two results is calculated in
@@ -217,7 +236,7 @@ joins the threads, waiting for any results not already there.
 <table border=1 bgcolor="#FFFFE0" width=500><tr><td>
 <pre>
   local lanes = require "lanes"
-  lanes.configure( 1)
+  lanes.configure()
 
   f= lanes.gen( function(n) return 2*n end )
   a= f(1)
@@ -240,8 +259,8 @@ joins the threads, waiting for any results not already there.
     but the particular arguments may vary. Only calling the generator function
     actually launches a lane, and provides a handle for controlling it.
     Alternatively, <tt>lane_func</tt> may be a string, in which case it will be compiled
-    in the lane. This is to be able to launch lanes whith LuaJIT,
-    which does not support lua_dump, used internally to transfer functions to the lane.
+    in the lane. This was to be able to launch lanes with older versions of LuaJIT,
+    which didn't not support lua_dump, used internally to transfer functions to the lane.
 <!--
 </p>
 <p>This prepares <tt>lane_func</tt> to be called in parallel. It does not yet start
@@ -257,19 +276,21 @@ also in the new lanes.
     <code>libs_str</code> defines the standard libraries made available to the
     new Lua state:
     <table>
-        <tr><td/><td>(nothing)</td><td>no standard libraries (default)</td></tr>
-        <tr><td width=40><td><tt>"base"</tt> or <tt>""</tt></td>
-            <td>root level names, <tt>print</tt>, <tt>assert</tt>, <tt>unpack</tt> etc.</td></tr>
-        <tr><td/><td><tt>"coroutine"</tt></td><td><tt>coroutine.*</tt> namespace <font size="-1">(part of base in Lua 5.1)</font></td></tr>
-        <tr><td/><td><tt>"debug"</tt></td><td><tt>debug.*</tt> namespace</td></tr>
-        <tr><td/><td><tt>"io"</tt></td><td><tt>io.*</tt> namespace</td></tr>
-        <tr><td/><td><tt>"math"</tt></td><td><tt>math.*</tt> namespace</td></tr>
-        <tr><td/><td><tt>"os"</tt></td><td><tt>os.*</tt> namespace</td></tr>
-        <tr><td/><td><tt>"package"</tt></td><td><tt>package.*</tt> namespace and <tt>require</tt></td></tr>
-        <tr><td/><td><tt>"string"</tt></td><td><tt>string.*</tt> namespace</td></tr>
-        <tr><td/><td><tt>"table"</tt></td><td><tt>table.*</tt> namespace</td></tr>
+        <tr><td width=40></td><td>(nothing)</td><td width=40></td><td>no standard libraries (default)</td></tr>
+        <tr><td/>
+            <td><tt>"base"</tt> or <tt>""</tt></td><td/>
+            <td>root level names, <tt>print</tt>, <tt>assert</tt>, <tt>unpack</tt> etc.</td>
+        </tr>
+        <tr><td/><td><tt>"coroutine"</tt></td><td/><td><tt>coroutine.*</tt> namespace <font size="-1">(part of base in Lua 5.1)</font></td></tr>
+        <tr><td/><td><tt>"debug"</tt></td><td/><td><tt>debug.*</tt> namespace</td></tr>
+        <tr><td/><td><tt>"io"</tt></td><td/><td><tt>io.*</tt> namespace</td></tr>
+        <tr><td/><td><tt>"math"</tt></td><td/><td><tt>math.*</tt> namespace</td></tr>
+        <tr><td/><td><tt>"os"</tt></td><td/><td><tt>os.*</tt> namespace</td></tr>
+        <tr><td/><td><tt>"package"</tt></td><td/><td><tt>package.*</tt> namespace and <tt>require</tt></td></tr>
+        <tr><td/><td><tt>"string"</tt></td><td/><td><tt>string.*</tt> namespace</td></tr>
+        <tr><td/><td><tt>"table"</tt></td><td/><td><tt>table.*</tt> namespace</td></tr>
         <br/>
-        <tr><td/><td><tt>"*"</tt></td><td>all standard libraries</td></tr>
+        <tr><td/><td><tt>"*"</tt></td><td/><td>all standard libraries</td></tr>
     </table>
 
 </p><p>
@@ -281,9 +302,9 @@ also in the new lanes.
     lanes are run:
 </p><p>
   <table>
-    <tr valign=top><td/><td>
+    <tr valign=top><td width=40></td><td>
         <code>.cancelstep</code> <br/><nobr>N / true</nobr></td>
-    <td>
+    <td width=40></td><td>
     By default, lanes are only cancellable when they <u>enter</u> a pending
     <tt>:receive()</tt> or <tt>:send()</tt> call.
     With this option, one can set cancellation check to occur every <tt>N</tt>
@@ -292,7 +313,7 @@ also in the new lanes.
     </td></tr>
 
     <tr valign=top><td/><td>
-        <code>.globals</code> <br/>globals_tbl</td>
+        <code>.globals</code> <br/>globals_tbl</td><td/>
     <td>
     Sets the globals table for the launched threads. This can be used for giving
     them constants.
@@ -305,21 +326,18 @@ also in the new lanes.
       <td/>
       <td>
         <code>.required</code> <br/>modules_tbl
-      </td>
+      </td><td/>
       <td>
         Lists modules that have to be required in order to be able to trasnfer
         functions they exposed. Starting with Lanes 3.0-beta, non-Lua functions are
         no longer copied by recreating a C closure from a C pointer, but are searched
         in lookup tables. These tables are built from the modules listed here. <tt>required</tt>
         must be a list of strings, each one being the name of a module to be required.
-        <br>
-    The global values of different lanes are in no manner connected;
-    modifying one will only affect the particular lane.
     </td>
     </tr>
 
     <tr valign=top><td width=40><td>
-        <code>.priority</code> <br/><nobr>-2..+2</nobr></td>
+        <code>.priority</code> <br/><nobr>-2..+2</nobr></td><td/>
         <td>The priority of lanes generated. -2 is lowest, +2 is highest.
         <br>
     Implementation and dependability of priorities varies
@@ -331,7 +349,7 @@ also in the new lanes.
         <td>
           <code>.package</code><br/>
         </td>
-        <td>
+        <td><td/>
           <code>package</code> contents overrides, if needed.
           Specifying it when <code>libs_str</code> doesn't cause the <code>package</code> library to be loaded will generate an error.
           If not specified, the created lane will receive the current values of <tt>package</tt>. Only path, cpath, preload and loaders are transfered.
@@ -704,7 +722,7 @@ events to a common Linda, but... :).</font>
     <code>= lanes.timer( linda_h, key, date_tbl|first_secs [,period_secs] )</code>
 </table>
 
-  <p>
+<p>
     Timers are implemented as a lane. They can be disabled by passing <tt>"NO_TIMERS"</tt>
     to <tt>lanes.configure()</tt>.
   </p>
@@ -1060,6 +1078,12 @@ its actual value.
 <h2 id="changes">Change log</h2>
 
 <p>
+  Feb-2012
+  <ul>
+    <li>Added support for an on_state_create callback invoked on a pristine Lua state created by Lanes.</li>
+    <li>This required a change in the <tt>lanes.configure()</tt> signature, hence the minor version bump.</li>
+  </ul>
+
 
   Nov-2011
   <ul>
diff --git a/src/keeper.c b/src/keeper.c
index 1f69d40..6f5bd95 100644
--- a/src/keeper.c
+++ b/src/keeper.c
@@ -78,7 +78,7 @@ static char const keeper_chunk[]=
 *       unclosed, because it does not really matter. In production code, this
 *       function never fails.
 */
-char const *init_keepers( int const _nbKeepers)
+char const* init_keepers( int const _nbKeepers, lua_CFunction _on_state_create)
 {
         int i;
         assert( _nbKeepers >= 1);
@@ -87,10 +87,11 @@ char const *init_keepers( int const _nbKeepers)
         for( i = 0; i < _nbKeepers; ++ i)
         {
 
-                // Initialize Keeper states with bare minimum of libs (those required
-                // by 'keeper.lua')
-                //
-                lua_State *K = luaL_newstate();
+                // Initialize Keeper states with bare minimum of libs (those required by 'keeper.lua')
+                // 
+                // 'io' for debugging messages, 'package' because we need to require modules exporting idfuncs
+                // the others because they export functions that we may store in a keeper for transfer between lanes
+                lua_State* K = luaG_newstate( "*", _on_state_create);
                 if (!K)
                         return "out of memory";
 
@@ -100,11 +101,6 @@ char const *init_keepers( int const _nbKeepers)
                 lua_concat( K, 2);
                 lua_setglobal( K, "decoda_name");
 
-                // 'io' for debugging messages, 'package' because we need to require modules exporting idfuncs
-                // the others because they export functions that we may store in a keeper for transfer between lanes
-                luaG_openlibs( K, "*");
-                serialize_require( K);
-
                 // Read in the preloaded chunk (and run it)
                 //
                 if( luaL_loadbuffer( K, keeper_chunk, sizeof(keeper_chunk), "@keeper.lua"))
@@ -114,7 +110,7 @@ char const *init_keepers( int const _nbKeepers)
                 {
                         // LUA_ERRRUN / LUA_ERRMEM / LUA_ERRERR
                         //
-                        const char *err = lua_tostring(K, -1);
+                        char const* err = lua_tostring( K, -1);
                         assert( err);
                         return err;
                 }
diff --git a/src/keeper.h b/src/keeper.h
index 1bcb36b..0990846 100644
--- a/src/keeper.h
+++ b/src/keeper.h
@@ -8,7 +8,7 @@ struct s_Keeper
         //int count;
 };
 
-const char *init_keepers( int const _nbKeepers);
+char const* init_keepers( int const _nbKeepers, lua_CFunction _on_state_create);
 void populate_keepers( lua_State *L);
 struct s_Keeper *keeper_acquire( const void *ptr);
 void keeper_release( struct s_Keeper *K);
diff --git a/src/lanes.c b/src/lanes.c
index 676032a..513a006 100644
--- a/src/lanes.c
+++ b/src/lanes.c
@@ -51,7 +51,7 @@
  *      ...
  */
 
-const char *VERSION= "3.0-beta";
+char const* VERSION = "3.1.0";
 
 /*
 ===============================================================================
@@ -1540,7 +1540,7 @@ static void require_one_module( lua_State *L, lua_State *L2, bool_t _fatal)
         {
                 lua_pop( L2, 1);
                 if( _fatal)
-                        luaL_error( L, "cannot pre-require modules without loading package library first");
+                        luaL_error( L, "cannot pre-require modules without loading 'package' library first");
         }
         else
         {
@@ -1557,14 +1557,15 @@ LUAG_FUNC( thread_new )
         struct s_lane *s;
         struct s_lane **ud;
 
-        const char *libs= lua_tostring( L, 2 );
-        uint_t cs= luaG_optunsigned( L, 3,0);
-        int prio= (int)luaL_optinteger( L, 4,0);
-        uint_t glob= luaG_isany(L,5) ? 5:0;
-        uint_t package = luaG_isany(L,6) ? 6:0;
-        uint_t required = luaG_isany(L,7) ? 7:0;
+        char const* libs = lua_tostring( L, 2);
+        lua_CFunction on_state_create = lua_iscfunction( L, 3) ? lua_tocfunction( L, 3) : NULL;
+        uint_t cs = luaG_optunsigned( L, 4, 0);
+        int prio = (int) luaL_optinteger( L, 5, 0);
+        uint_t glob = luaG_isany( L, 6) ? 6 : 0;
+        uint_t package = luaG_isany( L,7) ? 7 : 0;
+        uint_t required = luaG_isany( L, 8) ? 8 : 0;
 
-#define FIXED_ARGS (7)
+#define FIXED_ARGS 8
         uint_t args= lua_gettop(L) - FIXED_ARGS;
 
         if (prio < THREAD_PRIO_MIN || prio > THREAD_PRIO_MAX)
@@ -1575,23 +1576,13 @@ LUAG_FUNC( thread_new )
 
         /* --- Create and prepare the sub state --- */
 
-        L2 = luaL_newstate();   // uses standard 'realloc()'-based allocator,
-        // sets the panic callback
-
+        // populate with selected libraries at  the same time
+        //
+        L2 = luaG_newstate( libs, on_state_create);
         if (!L2) luaL_error( L, "'luaL_newstate()' failed; out of memory" );
 
         STACK_GROW( L, 2);
 
-        // Selected libraries
-        //
-        if (libs)
-        {
-                const char *err= luaG_openlibs( L2, libs);
-                ASSERT_L( !err );   // bad libs should have been noticed by 'lanes.lua'
-
-                serialize_require( L2);
-        }
-
         ASSERT_L( lua_gettop(L2) == 0);
 
         // package.path
@@ -1600,7 +1591,7 @@ LUAG_FUNC( thread_new )
         if( package)
         {
                 if (lua_type(L,package) != LUA_TTABLE)
-                        luaL_error( L, "expected package as table, got %s", luaG_typename(L,package));
+                        luaL_error( L, "expected package as table, got %s", luaL_typename(L,package));
                 lua_getglobal( L2, "package");
                 if( !lua_isnil( L2, -1)) // package library not loaded: do nothing
                 {
@@ -1628,7 +1619,7 @@ 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
-        // it not fatal if 'require' isn't loaded, just ignore (may cause function transfer errors later on if the lane pulls the lanes module itself)
+        // 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");
@@ -1644,7 +1635,7 @@ LUAG_FUNC( thread_new )
                 int nbRequired = 1;
                 // should not happen, was checked in lanes.lua before calling thread_new()
                 if (lua_type(L, required) != LUA_TTABLE)
-                        luaL_error( L, "expected required module list as a table, got %s", luaG_typename( L, required));
+                        luaL_error( L, "expected required module list as a table, got %s", luaL_typename( L, required));
                 lua_pushnil( L);
                 while( lua_next( L, required) != 0)
                 {
@@ -1671,7 +1662,7 @@ LUAG_FUNC( thread_new )
                 STACK_CHECK(L)
                 STACK_CHECK(L2)
                 if (!lua_istable(L,glob)) 
-                        luaL_error( L, "Expected table, got %s", luaG_typename(L,glob));
+                        luaL_error( L, "Expected table, got %s", luaL_typename(L,glob));
 
                 lua_pushnil( L);
                 while( lua_next( L, glob))
@@ -2240,7 +2231,7 @@ static const struct luaL_reg lanes_functions [] = {
 /*
 * One-time initializations
 */
-static void init_once_LOCKED( lua_State *L, volatile DEEP_PRELUDE ** timer_deep_ref, int const nbKeepers)
+static void init_once_LOCKED( lua_State* L, volatile DEEP_PRELUDE** timer_deep_ref, int const nbKeepers, lua_CFunction _on_state_create)
 {
     const char *err;
 
@@ -2291,7 +2282,7 @@ static void init_once_LOCKED( lua_State *L, volatile DEEP_PRELUDE ** timer_deep_
         }
   #endif
 #endif
-    err= init_keepers( nbKeepers);
+    err = init_keepers( nbKeepers, _on_state_create);
     if (err)
     {
             luaL_error( L, "Unable to initialize: %s", err );
@@ -2338,9 +2329,11 @@ static volatile long s_initCount = 0;
 
 LUAG_FUNC( configure )
 {
-    char const *name = luaL_checkstring( L, lua_upvalueindex( 1));
+    char const* name = luaL_checkstring( L, lua_upvalueindex( 1));
     int const nbKeepers = luaL_optint( L, 1, 1);
-    luaL_argcheck( L, nbKeepers > 0, 2, "Number of keeper states must be > 0");
+    lua_CFunction on_state_create = lua_iscfunction( L, 2) ? lua_tocfunction( L, 2) : NULL;
+    luaL_argcheck( L, nbKeepers > 0, 1, "Number of keeper states must be > 0");
+    luaL_argcheck( L, lua_iscfunction( L, 2) || lua_isnil( L, 2), 2, "on_state_create should be a C function");
     /*
     * Making one-time initializations.
     *
@@ -2353,7 +2346,7 @@ LUAG_FUNC( configure )
         static volatile int /*bool*/ go_ahead; // = 0
         if( InterlockedCompareExchange( &s_initCount, 1, 0) == 0)
         {
-            init_once_LOCKED(L, &timer_deep, nbKeepers);
+            init_once_LOCKED( L, &timer_deep, nbKeepers, on_state_create);
             go_ahead= 1;    // let others pass
         }
         else
@@ -2365,13 +2358,13 @@ LUAG_FUNC( configure )
     if( s_initCount == 0)
     {
         static pthread_mutex_t my_lock= PTHREAD_MUTEX_INITIALIZER;
-        pthread_mutex_lock(&my_lock);
+        pthread_mutex_lock( &my_lock);
         {
             // Recheck now that we're within the lock
             //
-            if (s_initCount == 0)
+            if( s_initCount == 0)
             {
-                init_once_LOCKED(L, &timer_deep, nbKeepers);
+                init_once_LOCKED( L, &timer_deep, nbKeepers, on_state_create);
                 s_initCount = 1;
             }
         }
@@ -2451,10 +2444,11 @@ luaopen_lanes( lua_State *L )
         {
                 lua_setfield( L, -2, "configure");
         }
-        else // already initialized: call it mmediately and be done
+        else // already initialized: call it immediately and be done
         {
                 lua_pushinteger( L, 666); // any value will do, it will be ignored
-                lua_call( L, 1, 0);
+                lua_pushnil( L); // almost idem
+                lua_call( L, 2, 0);
         }
         STACK_END( L, 1)
         return 1;
diff --git a/src/lanes.lua b/src/lanes.lua
index d56e05f..ec5a4e4 100644
--- a/src/lanes.lua
+++ b/src/lanes.lua
@@ -45,13 +45,21 @@ THE SOFTWARE.
 -- -> simply create a table, populate it, return it, and be done
 local lanes = {}
 
-lanes.configure = function( _nb_keepers, _timers)
+lanes.configure = function( _params)
+_params = _params or { nb_keepers = 1, with_timers = true, on_state_create = nil}
+if type( _params) ~= "table" then
+        error( "Bad parameter #1 to lanes.configure(), should be a table")
+end
+-- on_state_create may be nil or a function
+if _params.on_state_create and (type( _params.on_state_create) ~= "function") then
+        error( "Bad on_state_create: " .. tostring( _params.on_state_create), 2)
+end
 
 local mm = require "lua51-lanes"
 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
-if mm.configure then mm.configure( _nb_keepers) end
+if mm.configure then mm.configure( _params.nb_keepers, _params.on_state_create) end
 
 local thread_new = assert(mm.thread_new)
 
@@ -238,7 +246,7 @@ local function gen( ... )
     -- Lane generator
     --
     return function(...)
-              return thread_new( func, libs, cs, prio, g_tbl, package_tbl, required, ...)     -- args
+              return thread_new( func, libs, _params.on_state_create, cs, prio, g_tbl, package_tbl, required, ...)     -- args
            end
 end
 
@@ -258,7 +266,7 @@ local linda = mm.linda
 -- PUBLIC LANES API
 local timer = function() error "timers are not active" end
 
-if _timers ~= "NO_TIMERS" then
+if _params.with_timers ~= false then
 
 local timer_gateway= assert( mm.timer_gateway )
 --
@@ -477,7 +485,7 @@ timer = function( linda, key, a, period )
     timer_gateway:send( TGW_KEY, linda, key, wakeup_at, period )
 end
 
-end -- _timers
+end -- _params.with_timers
 
 ---=== Lock & atomic generators ===---
 
@@ -552,12 +560,16 @@ end
         lanes.genlock = genlock
         lanes.genatomic = genatomic
         -- from now on, calling configure does nothing but checking that we don't call it with parameters that changed compared to the first invocation
-        lanes.configure = function( _nk, _t)
-                if _nk ~= _nb_keepers then
-                        error( "mismatched configuration: " .. tostring( _nk) .. " keepers instead of " .. tostring( _nb_keepers))
+        lanes.configure = function( _params2)
+                _params2 = _params2 or _params
+                if _params2.nb_keepers ~= _params.nb_keepers then
+                        error( "mismatched configuration: " .. tostring( _params2.nb_keepers) .. " keepers instead of " .. tostring( _params.nb_keepers))
+                end
+                if _params2.with_timers ~= _params.with_timers then
+                        error( "mismatched configuration: " .. tostring( _params2.with_timers) .. " timer activity instead of " .. tostring( _params.with_timers))
                 end
-                if _t ~= _timers  then
-                        error( "mismatched configuration: " .. tostring( _t) .. " timer activity instead of " .. tostring( _timers))
+                if _params2.on_create_state and _params2.on_create_state ~= _params.on_create_state then
+                        error( "mismatched configuration: " .. tostring( _params2.on_create_state) .. " timer activity instead of " .. tostring( _params.on_create_state))
                 end
                 return lanes
         end
diff --git a/src/tools.c b/src/tools.c
index 85672e2..212cf52 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -91,7 +91,7 @@ void luaG_dump( lua_State* L ) {
 }
 
 
-/*---=== luaG_openlibs ===---*/
+/*---=== luaG_newstate ===---*/
 
 static const luaL_Reg libs[] = {
   { LUA_LOADLIBNAME, luaopen_package },
@@ -371,7 +371,7 @@ static void populate_func_lookup_table_recur( lua_State *L, int _ctx_base, int _
 }
 
 /*
- * create a "fully.qualified.name" <-> function equivalence dabase
+ * create a "fully.qualified.name" <-> function equivalence database
  */
 void populate_func_lookup_table( lua_State *L, int _i, char const *_name)
 {
@@ -422,39 +422,52 @@ void populate_func_lookup_table( lua_State *L, int _i, char const *_name)
 */
 #define is_name_char(c) (isalpha(c) || (c)=='*')
 
-const char *luaG_openlibs( lua_State *L, const char *libs)
+lua_State* luaG_newstate( char const* libs, lua_CFunction _on_state_create)
 {
-        const char *p;
-        unsigned len;
+        char const* p;
+        unsigned int len;
+        lua_State* const L = luaL_newstate();
 
-        if (!libs) return NULL;     // no libs, not even 'base'
-
-        // 'lua.c' stops GC during initialization so perhaps its a good idea. :)
-        //
-        lua_gc( L, LUA_GCSTOP, 0);
-
-        // Anything causes 'base' to be taken in
-        //
-        STACK_GROW(L,2);
-        STACK_CHECK(L)
-        lua_pushcfunction( L, luaopen_base);
-        lua_call( L, 0, 1);
-        // after opening base, register the functions they exported in our name<->function database
-        populate_func_lookup_table( L, LUA_GLOBALSINDEX, NULL);
-        lua_pop( L, 1);
-        STACK_MID( L, 0);
-        for( p= libs; *p; p+=len )
+        // no libs, or special init func (not even 'base')
+        if (libs || _on_state_create)
         {
-                len=0;
-                while (*p && !is_name_char(*p)) p++;    // bypass delimiters
-                while (is_name_char(p[len])) len++;     // bypass name
-                if (len && (!openlib( L, p, len )))
-                        break;
-        }
-        STACK_END(L,0)
-        lua_gc(L, LUA_GCRESTART, 0);
+                // 'lua.c' stops GC during initialization so perhaps its a good idea. :)
+                //
+                lua_gc( L, LUA_GCSTOP, 0);
 
-        return *p ? p : NULL;
+                // Anything causes 'base' to be taken in
+                //
+                STACK_GROW( L, 2);
+                STACK_CHECK( L)
+                if( _on_state_create)
+                {
+                        lua_pushcfunction( L, _on_state_create);
+                        lua_call( L, 0, 0);
+                }
+                if( libs)
+                {
+                        lua_pushcfunction( L, luaopen_base);
+                        lua_call( L, 0, 0);
+                }
+                // after opening base, register the functions it exported in our name<->function database
+                populate_func_lookup_table( L, LUA_GLOBALSINDEX, NULL);
+                STACK_MID( L, 0);
+                if( libs)
+                {
+                        for( p = libs; *p; p += len)
+                        {
+                                len=0;
+                                while (*p && !is_name_char(*p)) p++;    // bypass delimiters
+                                while (is_name_char(p[len])) len++;     // bypass name
+                                if (len && (!openlib( L, p, len )))
+                                        break;
+                        }
+                        serialize_require( L);
+                }
+                STACK_END(L,0)
+                lua_gc( L, LUA_GCRESTART, 0);
+        }
+        return L;
 }
 
 
@@ -1317,7 +1330,7 @@ static void inter_copy_func( lua_State *L2, uint_t L2_cache_i, lua_State *L, uin
                                 else
                                 {
                                         if( !inter_copy_one_( L2, L2_cache_i, L, lua_gettop(L), VT_NORMAL))
-                                                luaL_error( L, "Cannot copy upvalue type '%s'", luaG_typename( L, -1));
+                                                luaL_error( L, "Cannot copy upvalue type '%s'", luaL_typename( L, -1));
                                 }
                                 lua_pop( L, 1);
                         }
@@ -1475,7 +1488,7 @@ static bool_t inter_copy_one_( lua_State *L2, uint_t L2_cache_i, lua_State *L, u
                         lua_rawset( L2, -3 );    // add to table (pops key & val)
                     } else {
                         luaL_error( L, "Unable to copy over type '%s' (in %s)", 
-                                        luaG_typename(L,val_i), 
+                                        luaL_typename(L,val_i), 
                                         vt==VT_NORMAL ? "table":"metatable" );
                     }
                 }
@@ -1647,7 +1660,7 @@ static int new_require( lua_State *L)
 {
         int rc, i;
         int args = lua_gettop( L);
-        //char const *modname = luaL_checkstring( L, 1);
+        //char const* modname = luaL_checkstring( L, 1);
 
         STACK_GROW( L, args + 1);
         STACK_CHECK( L)
diff --git a/src/tools.h b/src/tools.h
index 1c9b00a..67f9874 100644
--- a/src/tools.h
+++ b/src/tools.h
@@ -46,13 +46,11 @@
 
 #define luaG_isany(L,i)  (!lua_isnil(L,i))
 
-#define luaG_typename( L, index ) lua_typename( L, lua_type(L,index) )
-
 typedef void (*luaG_IdFunction)( lua_State *L, char const * const which);
 
 void luaG_dump( lua_State* L );
 
-const char *luaG_openlibs( lua_State *L, const char *libs );
+lua_State* luaG_newstate( char const* libs, lua_CFunction _on_state_create);
 
 int luaG_deep_userdata( lua_State *L, luaG_IdFunction idfunc);
 void *luaG_todeep( lua_State *L, luaG_IdFunction idfunc, int index );
diff --git a/tests/appendud.lua b/tests/appendud.lua
index e275a98..d0efb26 100644
--- a/tests/appendud.lua
+++ b/tests/appendud.lua
@@ -7,7 +7,7 @@
 -- Needs Lanes >= 2.0.3
 --
 local lanes = require "lanes"
-lanes.configure( 1)
+lanes.configure()
 
 local _tab = {
     beginupdate = function (this) print('tab.beginupdate') end;
diff --git a/tests/atexit.lua b/tests/atexit.lua
index 09fbafd..31e1199 100644
--- a/tests/atexit.lua
+++ b/tests/atexit.lua
@@ -1,5 +1,5 @@
 local lanes = require "lanes"
-lanes.configure( 1)
+lanes.configure()
 
 -- create a free-running lane
 
diff --git a/tests/atomic.lua b/tests/atomic.lua
index f1c9428..12bdf02 100644
--- a/tests/atomic.lua
+++ b/tests/atomic.lua
@@ -5,7 +5,7 @@
 --
 
 local lanes = require "lanes"
-lanes.configure( 1)
+lanes.configure()
 
 local linda= lanes.linda()
 local key= "$"
diff --git a/tests/basic.lua b/tests/basic.lua
index 8b07697..eb8c04b 100644
--- a/tests/basic.lua
+++ b/tests/basic.lua
@@ -8,7 +8,7 @@
 --
 
 local lanes = require "lanes"
-lanes.configure( 1)
+lanes.configure()
 require "assert"    -- assert.fails()
 
 local lanes_gen=    assert( lanes.gen )
diff --git a/tests/cyclic.lua b/tests/cyclic.lua
index 15abc9c..656fde3 100644
--- a/tests/cyclic.lua
+++ b/tests/cyclic.lua
@@ -5,7 +5,7 @@
 --
 
 local lanes = require "lanes"
-lanes.configure( 1)
+lanes.configure()
 
 local table_concat= assert(table.concat)
 
diff --git a/tests/ehynes.lua b/tests/ehynes.lua
index b529f98..fff008c 100644
--- a/tests/ehynes.lua
+++ b/tests/ehynes.lua
@@ -2,7 +2,7 @@
 -- Test from <ehynes at dharmagaia.com>
 --
 local lanes = require "lanes"
-lanes.configure( 1)
+lanes.configure()
 
 local function PRINT_FMT( fmt, ... )
     io.stderr:write( string.format(fmt,...).."\n" )
diff --git a/tests/errhangtest.lua b/tests/errhangtest.lua
index 7127326..5974005 100644
--- a/tests/errhangtest.lua
+++ b/tests/errhangtest.lua
@@ -1,5 +1,5 @@
 local lanes = require "lanes"
-lanes.configure( 1)
+lanes.configure()
 
 local linda = lanes.linda()
 
diff --git a/tests/error.lua b/tests/error.lua
index aee4221..c4a64e3 100644
--- a/tests/error.lua
+++ b/tests/error.lua
@@ -5,7 +5,7 @@
 --

 

 local lanes = require "lanes"

-lanes.configure( 1)

+lanes.configure()

 

 local function lane()

 

diff --git a/tests/fibonacci.lua b/tests/fibonacci.lua
index 2e0cd62..55dede1 100644
--- a/tests/fibonacci.lua
+++ b/tests/fibonacci.lua
@@ -13,7 +13,7 @@
 -- Need to say it's 'local' so it can be an upvalue
 --
 local lanes = require "lanes"
-lanes.configure( 1, "NO_TIMERS")
+lanes.configure{ nb_keepers =1, with_timers = false}
 
 local function WR(str)
     io.stderr:write( str.."\n" )
diff --git a/tests/fifo.lua b/tests/fifo.lua
index d8289c1..3c403fa 100644
--- a/tests/fifo.lua
+++ b/tests/fifo.lua
@@ -5,7 +5,7 @@
 --
 
 local lanes = require "lanes"
-lanes.configure( 1)
+lanes.configure()
 
 local linda= lanes.linda()
 local atomic_inc= lanes.genatomic( linda, "FIFO_n" )
diff --git a/tests/finalizer.lua b/tests/finalizer.lua
index 88f51c1..6f186ab 100644
--- a/tests/finalizer.lua
+++ b/tests/finalizer.lua
@@ -9,7 +9,7 @@
 --

 

 local lanes = require "lanes"

-lanes.configure( 1)

+lanes.configure()

 

 local FN= "finalizer-test.tmp"

 

diff --git a/tests/func_is_string.lua b/tests/func_is_string.lua
index 5d94f85..d7cf0b2 100644
--- a/tests/func_is_string.lua
+++ b/tests/func_is_string.lua
@@ -1,5 +1,5 @@
 local lanes = require "lanes"
-lanes.configure( 1)
+lanes.configure()
 
 local options = {globals = { b = 666 }}
 
diff --git a/tests/hangtest.lua b/tests/hangtest.lua
index 923496a..6a9f7aa 100644
--- a/tests/hangtest.lua
+++ b/tests/hangtest.lua
@@ -3,7 +3,7 @@
 --

 

 local lanes = require "lanes"

-lanes.configure( 1)

+lanes.configure()

 

 local function ret(b)

     return b

diff --git a/tests/irayo_closure.lua b/tests/irayo_closure.lua
index 77ddbde..3278d57 100644
--- a/tests/irayo_closure.lua
+++ b/tests/irayo_closure.lua
@@ -11,7 +11,7 @@ e.g. { globals = { data = 1, func = function() useclosurehere() end } }"
 ]]
 
 local lanes = require "lanes"
-lanes.configure( 1)
+lanes.configure()
 
 local function testrun()
     assert( print )
diff --git a/tests/irayo_recursive.lua b/tests/irayo_recursive.lua
index 3eb14b8..f6fe87e 100644
--- a/tests/irayo_recursive.lua
+++ b/tests/irayo_recursive.lua
@@ -9,7 +9,7 @@ local function recurse()
     if i > 10 then return "finished" end
 
     local lanes = require "lanes"
-    lanes.configure( 1, "NO_TIMERS")
+    lanes.configure{ nb_keepers = 1, with_timers = false}
 
     local lane = lanes.gen( "*", { globals = { ["i"]= i + 1 } }, recurse ) ()
     return lane[1]
diff --git a/tests/keeper.lua b/tests/keeper.lua
index 7b11242..40c9e11 100644
--- a/tests/keeper.lua
+++ b/tests/keeper.lua
@@ -5,7 +5,7 @@
 --
 
 local lanes = require "lanes"
-lanes.configure( 1)
+lanes.configure()
 
 local function keeper(linda)
     local mt= {
diff --git a/tests/launchtest.lua b/tests/launchtest.lua
index 8456091..f3a6740 100644
--- a/tests/launchtest.lua
+++ b/tests/launchtest.lua
@@ -46,7 +46,7 @@ for k,v in pairs( argtable(...) ) do
 end
 
 local lanes = require "lanes"
-lanes.configure( 1)
+lanes.configure()
 
 local g= lanes.gen( LIBS, function(i) 
                         --io.stderr:write( i.."\t" )
diff --git a/tests/linda_perf.lua b/tests/linda_perf.lua
index 12159da..fff2670 100644
--- a/tests/linda_perf.lua
+++ b/tests/linda_perf.lua
@@ -1,5 +1,5 @@
 local lanes = require "lanes"
-lanes.configure( 1)
+lanes.configure()
 
 -- this lane eats items in the linda one by one
 local eater = function( l, loop)
diff --git a/tests/objects.lua b/tests/objects.lua
index 29e16d8..14cf9ba 100644
--- a/tests/objects.lua
+++ b/tests/objects.lua
@@ -5,7 +5,7 @@
 --
 
 local lanes = require "lanes"
-lanes.configure( 1)
+lanes.configure()
 
 local linda= lanes.linda()
 
diff --git a/tests/perftest.lua b/tests/perftest.lua
index 3d9fde0..4df2ad8 100644
--- a/tests/perftest.lua
+++ b/tests/perftest.lua
@@ -28,7 +28,7 @@ local MSYS= os.getenv("OSTYPE")=="msys"
 
 
 local lanes = require "lanes"
-lanes.configure( 1)
+lanes.configure()
 
 local m= require "argtable"
 local argtable= assert( m.argtable )
diff --git a/tests/recursive.lua b/tests/recursive.lua
index ad32df8..571fc1e 100644
--- a/tests/recursive.lua
+++ b/tests/recursive.lua
@@ -13,7 +13,7 @@ local function func( depth )
 
     local lanes = require "lanes"
     -- lanes.configure() is gone after we call it...
-    lanes.configure( 1)
+    lanes.configure()
     local lane= lanes.gen("*", func)( depth+1 )
     return lane[1]
 end
diff --git a/tests/require.lua b/tests/require.lua
index 96717dc..f538dc6 100644
--- a/tests/require.lua
+++ b/tests/require.lua
@@ -4,7 +4,7 @@
 -- Test that 'require' works from sublanes
 --
 local lanes = require "lanes"
-lanes.configure( 1)
+lanes.configure()
 
 local function a_lane()
     -- To require 'math' we still actually need to have it initialized for
diff --git a/tests/timer.lua b/tests/timer.lua
index f0027d7..c6f510b 100644
--- a/tests/timer.lua
+++ b/tests/timer.lua
@@ -9,7 +9,7 @@ io.stderr:setvbuf "no"
 
 
 local lanes = require "lanes"
-lanes.configure( 1)
+lanes.configure()
 
 local linda= lanes.linda()