new .internal_allocator configuration IUNTESTED)

new configuration option .internal_allocator to help LuaJIT users. THIS IS YET UNTESTED, USE AT YOUR OWN RISKS.

1 files changed, 4 insertions, 16 deletions

diff --git a/src/keeper.c b/src/keeper.c
index 19b9e1a..f4dde0a 100644
--- a/src/keeper.c
+++ b/src/keeper.c
@@ -580,7 +580,7 @@ int keepercall_count( lua_State* L)
 */
 
 // called as __gc for the keepers array userdata
-void close_keepers( Universe* U, lua_State* L)
+void close_keepers( Universe* U)
 {
     if( U->keepers != NULL)
     {
@@ -611,15 +611,8 @@ void close_keepers( Universe* U, lua_State* L)
         }
         // free the keeper bookkeeping structure
         {
-            // don't hijack the state allocator when running LuaJIT because it looks like LuaJIT does not expect it and might invalidate the memory unexpectedly
-#if USE_LUA_STATE_ALLOCATOR()
-            {
-                AllocatorDefinition* const allocD = &U->protected_allocator.definition;
-                allocD->allocF( allocD->allocUD, U->keepers, sizeof( Keepers) + (nbKeepers - 1) * sizeof( Keeper), 0);
-            }
-#else // USE_LUA_STATE_ALLOCATOR()
-            free(U->keepers);
-#endif // USE_LUA_STATE_ALLOCATOR()
+            AllocatorDefinition* const allocD = &U->internal_allocator;
+            allocD->allocF( allocD->allocUD, U->keepers, sizeof( Keepers) + (nbKeepers - 1) * sizeof( Keeper), 0);
             U->keepers = NULL;
         }
     }
@@ -653,15 +646,10 @@ void init_keepers( Universe* U, lua_State* L)
     // Keepers contains an array of 1 s_Keeper, adjust for the actual number of keeper states
     {
         size_t const bytes = sizeof( Keepers) + (nb_keepers - 1) * sizeof( Keeper);
-        // don't hijack the state allocator when running LuaJIT because it looks like LuaJIT does not expect it and might invalidate the memory unexpectedly
-#if USE_LUA_STATE_ALLOCATOR()
         {
-            AllocatorDefinition* const allocD = &U->protected_allocator.definition;
+            AllocatorDefinition* const allocD = &U->internal_allocator;
             U->keepers = (Keepers*) allocD->allocF( allocD->allocUD, NULL, 0, bytes);
         }
-#else // USE_LUA_STATE_ALLOCATOR()
-        U->keepers = (Keepers*)malloc(bytes);
-#endif // USE_LUA_STATE_ALLOCATOR()
         if( U->keepers == NULL)
         {
             (void) luaL_error( L, "init_keepers() failed while creating keeper array; out of memory");