Refactor array and object pooling

Author: austinv900

src/ArrayPool.cs

@@ -5,17 +5,17 @@ namespace Oxide.Core
 {
     public static class ArrayPool
     {
-        private static readonly IArrayPoolProvider<object> pool;
+        private static IArrayPool<object> Pool { get; }
 
         static ArrayPool()
         {
-            pool = Interface.Oxide.PoolFactory.GetArrayProvider<object>();
+            Pool = ArrayPool<object>.Shared;
         }
 
-        [Obsolete("Use Interface.Oxide.PoolFactory")]
-        public static object[] Get(int length) => pool.Take(length);
+        [Obsolete("Use ArrayPool<T>.Shared")]
+        public static object[] Get(int length) => Pool.Take(length);
 
-        [Obsolete("Use Interface.Oxide.PoolFactory")]
-        public static void Free(object[] array) => pool.Return(array);
+        [Obsolete("Use ArrayPool<T>.Shared")]
+        public static void Free(object[] array) => Pool.Return(array);
     }
 }

src/Interface.cs

@@ -18,12 +18,12 @@ public static class Interface
         /// </summary>
         public static NativeDebugCallback DebugCallback { get; set; }
 
-        private static IArrayPoolProvider<object> HookArrays { get; }
+        private static IArrayPool<object> HookArrays { get; }
 
         static Interface()
         {
             Oxide = new OxideMod();
-            HookArrays = Oxide.PoolFactory.GetArrayProvider<object>();
+            HookArrays = ArrayPool<object>.Shared;
         }
 
         /// <summary>

src/Libraries/Covalence/Formatter.cs

@@ -129,7 +129,7 @@ public class Formatter
                 [ElementType.Color] = c => new Tag($"[c/{RGBAtoRGB(c)}:", "]")
             };
 
-        private static readonly IPoolProvider<StringBuilder> stringPool = Interface.Oxide.PoolFactory.GetProvider<StringBuilder>();
+        private static readonly IPool<StringBuilder> stringPool = PoolFactory<StringBuilder>.Shared;
 
         private class Token : Poolable<Token>
         {

src/Oxide.Core.csproj

@@ -18,7 +18,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Lib.Harmony" Version="2.3.1.1" />
-    <PackageReference Include="Oxide.Common" Version="2.0.*" />
+    <PackageReference Include="Oxide.Common" Version="2.0.37-develop" />
     <PackageReference Include="Oxide.References" Version="2.0.*">
       <PrivateAssets>contentfiles;analyzers;build</PrivateAssets>
     </PackageReference>

src/OxideMod.cs

@@ -42,11 +42,6 @@ public sealed class OxideMod
         /// </summary>
         public static readonly string Branch = Assembly.GetExecutingAssembly().Metadata("GitBranch").FirstOrDefault() ?? "unknown";
 
-        /// <summary>
-        /// Retrieve pooled objects
-        /// </summary>
-        public IPoolFactory PoolFactory { get; }
-
         /// <summary>
         /// Gets the main logger
         /// </summary>
@@ -122,8 +117,6 @@ public sealed class OxideMod
         public OxideMod()
         {
             init_called = false;
-            CorePoolFactory factory = new CorePoolFactory();
-            PoolFactory = factory;
         }
 
         /// <summary>

src/Plugins/CSPlugin.cs

@@ -76,14 +76,14 @@ protected Harmony HarmonyInstance
         /// <summary>
         /// Pool of <see cref="object"/> array's
         /// </summary>
-        protected IArrayPoolProvider<object> ObjectArrayPool { get; }
+        protected IArrayPool<object> ObjectArrayPool { get; }
 
         /// <summary>
         /// Initializes a new instance of the CSPlugin class
         /// </summary>
         public CSPlugin()
         {
-            ObjectArrayPool = Interface.Oxide.PoolFactory.GetArrayProvider<object>();
+            ObjectArrayPool = ArrayPool<object>.Shared;
 
             // Find all hooks in the plugin and any base classes derived from CSPlugin
             Type type = GetType();

src/Plugins/PluginManager.cs

@@ -79,15 +79,15 @@ public HookSubscriptions()
         // Re-usable conflict list used for hook calls
         private readonly List<string> hookConflicts = new List<string>();
 
-        private IArrayPoolProvider<object> ObjectPool { get; }
+        private IArrayPool<object> ObjectPool { get; }
 
         /// <summary>
         /// Initializes a new instance of the PluginManager class
         /// </summary>
         public PluginManager(Logger logger)
         {
             // Initialize
-            ObjectPool = Interface.Oxide.PoolFactory.GetArrayProvider<object>();
+            ObjectPool = ArrayPool<object>.Shared;
             loadedPlugins = new Dictionary<string, Plugin>();
             hookSubscriptions = new Dictionary<string, HookSubscriptions>();
             Logger = logger;

src/Plugins/Watchers/FSWatcher.cs

@@ -39,7 +39,7 @@ private class QueuedChange
         private Timer timers;
 
         private Dictionary<string, FileSystemWatcher> m_symlinkWatchers = new Dictionary<string, FileSystemWatcher>();
-        private IPoolProvider<StringBuilder> StringPool { get; }
+        private IPool<StringBuilder> StringPool { get; }
 
         /// <summary>
         /// Initializes a new instance of the FSWatcher class
@@ -48,7 +48,7 @@ private class QueuedChange
         /// <param name="filter"></param>
         public FSWatcher(string directory, string filter)
         {
-            StringPool = Interface.Oxide.PoolFactory.GetProvider<StringBuilder>();
+            StringPool = PoolFactory<StringBuilder>.Shared;
             watchedPlugins = new HashSet<string>();
             changeQueue = new Dictionary<string, QueuedChange>();
             timers = Interface.Oxide.GetLibrary<Timer>();