A bit refactoring pools related stuff and bumping up a version

bitdotgames · Nov 30, 2024 · a2accaf · a2accaf
1 parent 9fb1979
commit a2accaf
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 25 deletions.
diff --git a/src/vm/util/refc_list.cs b/src/vm/util/refc_list.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Runtime.CompilerServices;
 
 namespace bhl {
 
@@ -13,22 +14,21 @@ public class RefcList<T> : List<T>, IValRefcounted, IDisposable
 
    public int refs => _refs; 
 
-   static class PoolHolder<T1>
-   { 
-     [ThreadStatic]
-     static public Pool<RefcList<T1>> _pool;
-     public static Pool<RefcList<T1>> pool {
-      get {
-        if(_pool == null) 
-          _pool = new Pool<RefcList<T1>>(); 
-        return _pool;
-      }
-     }
-   }
+
+  [ThreadStatic]
+  static Pool<RefcList<T>> _pool;
+
+  [MethodImpl(MethodImplOptions.AggressiveInlining)]
+  static Pool<RefcList<T>> GetPool()
+  {
+    if(_pool == null) 
+      _pool = new Pool<RefcList<T>>(); 
+    return _pool;
+  }
 
    static public RefcList<T> New()
    {
-     var pool = PoolHolder<T>.pool;
+     var pool = GetPool();
 
      RefcList<T> list = null;
      if(pool.stack.Count == 0)

diff --git a/src/vm/util/val_list_adapter.cs b/src/vm/util/val_list_adapter.cs
@@ -24,22 +24,20 @@ public class ValList<T> : IList<T>, IValRefcounted, IDisposable
 
   public int refs => _refs; 
 
-  static class PoolHolder<T1>
+  [ThreadStatic]
+  static Pool<ValList<T>> _pool;
+
+  [MethodImpl(MethodImplOptions.AggressiveInlining)]
+  static Pool<ValList<T>> GetPool()
   {
-     [ThreadStatic]
-     static public Pool<ValList<T1>> _pool;
-     public static Pool<ValList<T1>> pool {
-      get {
-        if(_pool == null) 
-          _pool = new Pool<ValList<T1>>(); 
-        return _pool;
-      }
-     }
+    if(_pool == null) 
+      _pool = new Pool<ValList<T>>(); 
+    return _pool;
   }
 
   static public ValList<T> New(ValList lst, Func<Val, T> val2native)
   {
-    var pool = PoolHolder<T>.pool;
+    var pool = GetPool();
 
     ValList<T> vls = null;
     if(pool.stack.Count == 0)

diff --git a/src/vm/version.cs b/src/vm/version.cs
@@ -2,7 +2,7 @@ namespace bhl {
 
 public static class Version 
 {
-  public static string Name = "v2.0.0-beta193";
+  public static string Name = "v2.0.0-beta194";
 }
 
 }