remove table allocator

Author: CppCXY

crates/luars/src/gc/mod.rs

@@ -39,7 +39,6 @@ mod gc_object;
 mod object_allocator;
 mod paged_pool;
 mod string_interner;
-mod table_allocator;
 
 #[cfg(debug_assertions)]
 use std::collections::HashMap;
@@ -54,7 +53,6 @@ pub use gc_object::*;
 pub use object_allocator::*;
 pub use paged_pool::*;
 pub use string_interner::*;
-pub use table_allocator::*;
 
 // GC Parameters (from lua.h)
 pub const MINORMUL: usize = 0; // Minor collection multiplier

crates/luars/src/gc/object_allocator.rs

@@ -8,8 +8,7 @@ use crate::{
     LuaRawFunction, LuaRawTable, LuaResult, LuaValue,
     gc::{
         GC, GcCClosure, GcFunction, GcObjectOwner, GcProto, GcRClosure, GcString, GcTable,
-        GcThread, GcUpvalue, GcUserdata, PagedPool, Pooled, ProtoPtr, StringPtr, TableAllocHandle,
-        UpvaluePtr,
+        GcThread, GcUpvalue, GcUserdata, PagedPool, Pooled, ProtoPtr, StringPtr, UpvaluePtr,
     },
 };
 
@@ -26,7 +25,6 @@ pub struct ObjectAllocator {
     userdata_pool: PagedPool<GcUserdata>,
     proto_pool: PagedPool<GcProto>,
     call_info_pool: PagedPool<CallInfo>,
-    table_allocator: TableAllocHandle,
 }
 
 impl Default for ObjectAllocator {
@@ -48,7 +46,6 @@ impl ObjectAllocator {
             userdata_pool: PagedPool::new(16),
             proto_pool: PagedPool::new(16),
             call_info_pool: PagedPool::new(64),
-            table_allocator: TableAllocHandle::default(),
         }
     }
 
@@ -121,11 +118,7 @@ impl ObjectAllocator {
         };
         let size = (base_size + array_bytes + hash_bytes) as u32;
         let ptr = self.table_pool.alloc(GcTable::new(
-            LuaRawTable::new(
-                array_size as u32,
-                hash_size as u32,
-                self.table_allocator.clone(),
-            ),
+            LuaRawTable::new(array_size as u32, hash_size as u32),
             current_white,
             size,
         ));
@@ -280,7 +273,6 @@ impl ObjectAllocator {
     pub fn trim_after_full_gc(&mut self) {
         self.table_pool.release_empty_pages();
         self.string_pool.release_empty_pages();
-        self.table_allocator.clear_cached_blocks();
         self.cclosure_pool.release_empty_pages();
         self.rclosure_pool.release_empty_pages();
         self.upvalue_pool.release_empty_pages();

crates/luars/src/gc/table_allocator.rs

@@ -2,10 +2,7 @@
 pub mod native_table;
 
 use super::lua_value::LuaValue;
-use crate::{
-    LuaError, LuaResult,
-    gc::{TableAllocHandle, TablePtr},
-};
+use crate::{LuaError, LuaResult, gc::TablePtr};
 use native_table::NativeTable;
 
 /// Mask covering all TM flags — any bit set to 1 represents a cacheable TM.
@@ -23,11 +20,11 @@ pub struct LuaRawTable {
 
 impl LuaRawTable {
     /// 创建新table
-    pub fn new(asize: u32, hsize: u32, allocator: TableAllocHandle) -> Self {
+    pub fn new(asize: u32, hsize: u32) -> Self {
         Self {
             meta: TablePtr::null(),
             flags: 0,
-            impl_table: NativeTable::new(asize, hsize, allocator),
+            impl_table: NativeTable::new(asize, hsize),
         }
     }