4 files changed, 54 insertions, 24 deletions

diff --git a/CHANGES b/CHANGES
index 2e6838e..c196455 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,10 @@
 CHANGES:
 
+CHANGE 87: BGe 20-Dec-13
+   * version 3.7.5
+   * fixed a crash that can occur at shutdown when an object stored inside a keeper state performs a linda operation on a linda making use of another keeper
+   * new setting demote_full_userdata to select between light userdata demotion or raising an error when attempting to transfer a non-deep full userdata
+
 CHANGE 86: BGe 3-Dec-13
    * version 3.7.4
    * internal refactoring of pthread priority management code
diff --git a/docs/index.html b/docs/index.html
index af08397..f25463d 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -70,7 +70,7 @@
                         </p>
 
                         <p>
-                                This document was revised on 3-Dec-13, and applies to version <tt>3.7.4</tt>.
+                                This document was revised on 20-Dec-13, and applies to version <tt>3.7.5</tt>.
                         </p>
                 </font>
         </center>
@@ -273,7 +273,7 @@
                         <th style="width:70%">definition</th>
                 </tr>
                 <tr valign=top>
-                        <td>
+                        <td id="nb_keepers">
                                 <code>.nb_keepers</code>
                         </td>
                         <td>integer >= 1</td>
@@ -283,7 +283,7 @@
                 </tr>
 
                 <tr valign=top>
-                        <td>
+                        <td id="with_timers">
                                 <code>.with_timers</code>
                         </td>
                         <td>
@@ -296,7 +296,7 @@
                 </tr>
 
                 <tr valign=top>
-                        <td>
+                        <td id="verbose_errors">
                                 <code>.verbose_errors</code>
                         </td>
                         <td>
@@ -309,7 +309,7 @@
                 </tr>
 
                 <tr valign=top>
-                        <td>
+                        <td id="protect_allocator">
                                 <code>.protect_allocator</code>
                         </td>
                         <td>
@@ -322,6 +322,19 @@
                 </tr>
 
                 <tr valign=top>
+                        <td id="demote_full_userdata">
+                                <code>.demote_full_userdata</code>
+                        </td>
+                        <td>
+                                <tt>nil</tt>/<tt>false</tt>/<tt>true</tt>
+                        </td>
+                        <td>
+                                (Since v3.7.5) If equal to <tt>false</tt> or <tt>nil</tt>, Lanes raises an error when attempting to transfer a non-deep full userdata, else it will be demoted to a light userdata in the destination.
+                                Default is <tt>false</tt> (set to <tt>true</tt> to get the legacy behaviour).
+                        </td>
+                </tr>
+
+                <tr valign=top>
                         <td id="track_lanes">
                                 <code>.track_lanes</code>
                         </td>
@@ -335,7 +348,7 @@
                 </tr>
 
                 <tr valign=top>
-                        <td>
+                        <td id="on_state_create">
                                 <code>.on_state_create</code>
                         </td>
                         <td>
@@ -354,8 +367,8 @@
                 </tr>
 
                 <tr valign=top>
-                        <td>
-                                <code>.shutdown_timeout</code> <br/>
+                        <td id="shutdown_timeout">
+                                <code>.shutdown_timeout</code>
                         </td>
                         <td>
                                 number >= 0
@@ -1133,7 +1146,7 @@ events to a common Linda, but... :).</font>
 </pre></td></tr></table>
 
 <p>
-        Timers are implemented as a lane. They can be disabled by setting <tt>"with_timers"</tt> to <tt>nil</tt> or <tt>false</tt> to <tt>lanes.configure()</tt>.
+        Timers are implemented as a lane. They can be disabled by setting "<tt><a href="#with_timers">with_timers</a></tt>" to <tt>nil</tt> or <tt>false</tt> to <tt>lanes.configure()</tt>.
 </p>
 
 <p>
@@ -1289,6 +1302,7 @@ events to a common Linda, but... :).</font>
                         Full userdata can be passed only if it's prepared using the <a href="#deep_userdata">deep userdata</a> system, which handles its lifespan management
                         <ul>
                                 <li>In particular, lane handles cannot be passed between lanes.</li>
+                                <li>Lanes can either throw an error or attempt a <a href="#demote_full_userdata">light userdata demotion</a>.</li>
                         </ul>
                 </li>
                 <li>Coroutines cannot be passed. A coroutine's Lua state is tied to the Lua state that created it, and there is no way the mixed C/Lua stack of a coroutine can be transfered from one Lua state to another.</li>
diff --git a/src/keeper.c b/src/keeper.c
index 99f510b..4c90069 100644
--- a/src/keeper.c
+++ b/src/keeper.c
@@ -184,7 +184,8 @@ static void push_table( lua_State* L, int idx)
 int keeper_push_linda_storage( lua_State* L, void* ptr)
 {
         struct s_Keeper* K = keeper_acquire( ptr);
-        lua_State* KL = K->L;
+        lua_State* KL = K ? K->L : NULL;
+        if( KL == NULL) return 0;
         STACK_CHECK( KL);
         lua_pushlightuserdata( KL, fifos_key);                      // fifos_key
         lua_rawget( KL, LUA_REGISTRYINDEX);                         // fifos
@@ -535,14 +536,18 @@ void close_keepers( void)
 #endif // HAVE_KEEPER_ATEXIT_DESINIT
 {
         int i;
-        // 2-pass close, in case a keeper holds a reference to a linda bound to another keeoer
-        for( i = 0; i < GNbKeepers; ++ i)
+        int const nbKeepers = GNbKeepers;
+        // NOTE: imagine some keeper state N+1 currently holds a linda that uses another keeper N, and a _gc that will make use of it
+        // when keeper N+1 is closed, object is GCed, linda operation is called, which attempts to acquire keeper N, whose Lua state no longer exists
+        // in that case, the linda operation should do nothing. which means that these operations must check for keeper acquisition success
+        GNbKeepers = 0;
+        for( i = 0; i < nbKeepers; ++ i)
         {
                 lua_State* L = GKeepers[i].L;
                 GKeepers[i].L = NULL;
                 lua_close( L);
         }
-        for( i = 0; i < GNbKeepers; ++ i)
+        for( i = 0; i < nbKeepers; ++ i)
         {
                 MUTEX_FREE( &GKeepers[i].lock_);
         }
@@ -551,7 +556,6 @@ void close_keepers( void)
                 free( GKeepers);
         }
         GKeepers = NULL;
-        GNbKeepers = 0;
 }
 
 /*
@@ -626,7 +630,7 @@ struct s_Keeper* keeper_acquire( void const* ptr)
                 * have to cast to unsigned long to avoid compilation warnings about loss of data when converting pointer-to-integer
                 */
                 unsigned int i = (unsigned int)(((unsigned long)(ptr) >> 3) % GNbKeepers);
-                struct s_Keeper *K= &GKeepers[i];
+                struct s_Keeper* K= &GKeepers[i];
 
                 MUTEX_LOCK( &K->lock_);
                 //++ K->count;
diff --git a/src/lanes.c b/src/lanes.c
index 6621735..e66342d 100644
--- a/src/lanes.c
+++ b/src/lanes.c
@@ -52,7 +52,7 @@
  *      ...
  */
 
-char const* VERSION = "3.7.4";
+char const* VERSION = "3.7.5";
 
 /*
 ===============================================================================
@@ -420,7 +420,8 @@ LUAG_FUNC( linda_send)
         STACK_GROW(L, 1);
         {
                 struct s_Keeper* K = keeper_acquire( linda);
-                lua_State* KL = K->L;    // need to do this for 'STACK_CHECK'
+                lua_State* KL = K ? K->L : NULL; // need to do this for 'STACK_CHECK'
+                if( KL == NULL) return 0;
                 STACK_CHECK( KL);
                 for( ;;)
                 {
@@ -584,6 +585,7 @@ LUAG_FUNC( linda_receive)
 
         {
                 struct s_Keeper *K = keeper_acquire( linda);
+                if( K == NULL) return 0;
                 for( ;;)
                 {
                         // all arguments of receive() but the first are passed to the keeper's receive function
@@ -690,6 +692,7 @@ LUAG_FUNC( linda_set)
         {
                 int pushed;
                 struct s_Keeper *K = keeper_acquire( linda);
+                if( K == NULL) return 0;
                 // no nil->sentinel toggling, we really clear the linda contents for the given key with a set()
                 pushed = keeper_call( K->L, KEEPER_API( set), L, linda, 2);
                 if( pushed >= 0) // no error?
@@ -722,7 +725,7 @@ LUAG_FUNC( linda_set)
  */
 LUAG_FUNC( linda_count)
 {
-        struct s_Linda *linda= lua_toLinda( L, 1);
+        struct s_Linda* linda = lua_toLinda( L, 1);
         int pushed;
 
         luaL_argcheck( L, linda, 1, "expected a linda object!");
@@ -730,7 +733,8 @@ LUAG_FUNC( linda_count)
         check_key_types( L, 2, lua_gettop( L));
 
         {
-                struct s_Keeper *K = keeper_acquire( linda);
+                struct s_Keeper* K = keeper_acquire( linda);
+                if( K == NULL) return 0;
                 pushed = keeper_call( K->L, KEEPER_API( count), L, linda, 2);
                 keeper_release( K);
                 if( pushed < 0)
@@ -758,14 +762,15 @@ LUAG_FUNC( linda_get)
         check_key_types( L, 2, 2);
 
         {
-                struct s_Keeper *K = keeper_acquire( linda);
+                struct s_Keeper* K = keeper_acquire( linda);
+                if( K == NULL) return 0;
                 pushed = keeper_call( K->L, KEEPER_API( get), L, linda, 2);
-                ASSERT_L( pushed==0 || pushed==1 );
+                ASSERT_L( pushed == 0 || pushed == 1);
                 if( pushed > 0)
                 {
                         keeper_toggle_nil_sentinels( L, lua_gettop( L) - pushed, 0);
                 }
-                keeper_release(K);
+                keeper_release( K);
                 // must trigger error after keeper state has been released
                 if( pushed < 0)
                 {
@@ -784,7 +789,8 @@ LUAG_FUNC( linda_get)
 */
 LUAG_FUNC( linda_limit)
 {
-        struct s_Linda* linda= lua_toLinda( L, 1 );
+        struct s_Linda* linda= lua_toLinda( L, 1);
+        int pushed;
 
         luaL_argcheck( L, linda, 1, "expected a linda object!");
         // make sure we got a key and a limit
@@ -796,7 +802,8 @@ LUAG_FUNC( linda_limit)
 
         {
                 struct s_Keeper* K = keeper_acquire( linda);
-                int pushed = keeper_call( K->L, KEEPER_API( limit), L, linda, 2);
+                if( K == NULL) return 0;
+                pushed = keeper_call( K->L, KEEPER_API( limit), L, linda, 2);
                 ASSERT_L( pushed <= 0); // either error or no return values
                 keeper_release( K);
                 // must trigger error after keeper state has been released