Updates to disposable.

Author: Oren (electricessence)

benchmarking/Open.Disposable.ObjectPools.Benchmarking.csproj

@@ -20,8 +20,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Open.Diagnostics" Version="1.3.0" />
-    <PackageReference Include="Open.Text.CSV" Version="2.0.0" />
+    <PackageReference Include="Open.Diagnostics" Version="1.4.0" />
+    <PackageReference Include="Open.Text.CSV" Version="2.1.0" />
   </ItemGroup>
 
   <ItemGroup>

source/Array/InterlockedArrayObjectPool.cs

@@ -71,9 +71,9 @@ protected override T TryRelease()
 			return null;
 		}
 
-		protected override void OnDispose(bool calledExplicitly)
+		protected override void OnDispose()
 		{
-			base.OnDispose(calledExplicitly);
+			base.OnDispose();
 			Pool = null;
 			MaxStored = 0;
 		}

source/GlobalSuppressions.cs

@@ -6,3 +6,6 @@
 
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "CA1815:Override equals and operator equals on value types", Justification = "<Pending>", Scope = "type", Target = "~T:Open.Disposable.ReferenceContainer`1")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "CA1815:Override equals and operator equals on value types", Justification = "<Pending>", Scope = "type", Target = "~T:Open.Disposable.DualReferenceContainer`1")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0044:Add readonly modifier", Justification = "<Pending>", Scope = "member", Target = "~F:Open.Disposable.ObjectPoolAutoTrimmer._trimmedSize")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0044:Add readonly modifier", Justification = "<Pending>", Scope = "member", Target = "~F:Open.Disposable.ObjectPoolAutoTrimmer._trimDelay")]
+

source/ObjectPoolAutoTrimmer.cs

@@ -77,7 +77,7 @@ protected virtual void TrimInternal()
 			_pool?.TrimTo(_trimmedSize);
 		}
 
-		protected override void OnDispose(bool calledExplicitly)
+		protected override void OnDispose()
 		{
 			DisposeOf(ref _trimmer);
 

source/ObjectPoolBase.cs

@@ -122,9 +122,10 @@ protected override void OnBeforeDispose()
 			MaxSize = 0;
 		}
 
-		protected override void OnDispose(bool calledExplicitly)
+		protected override void OnDispose()
 		{
-			if (!calledExplicitly || OnDiscarded == null) return;
+			if (OnDiscarded == null) return;
+
 			T d;
 			while ((d = TryRelease()) != null) OnDiscarded(d);
 		}

source/Open.Disposable.ObjectPools.csproj

@@ -16,9 +16,9 @@ Part of the "Open" set of libraries.</Description>
     <RepositoryType>git</RepositoryType>
     <PackageTags>objectpool, dotnet, dotnetcore, cs, idisposable, threadsafe, thread-safe</PackageTags>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>2.2.0</Version>
-    <AssemblyVersion>2.2.0.0</AssemblyVersion>
-    <FileVersion>2.2.0.0</FileVersion>
+    <Version>2.3.0</Version>
+    <AssemblyVersion>2.3.0.0</AssemblyVersion>
+    <FileVersion>2.3.0.0</FileVersion>
     <PackageReleaseNotes></PackageReleaseNotes>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
@@ -42,7 +42,7 @@ Part of the "Open" set of libraries.</Description>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Open.Disposable" Version="2.0.1" />
+    <PackageReference Include="Open.Disposable" Version="2.1.0" />
     <PackageReference Include="Open.Threading.Tasks" Version="1.1.3" />
     <PackageReference Include="System.Threading.Channels" Version="4.5.0" />
   </ItemGroup>

source/Recycler.cs

@@ -44,10 +44,10 @@ public override bool Recycle(T item)
 		protected override void OnCloseRequested()
 			=> _bin?.Writer.Complete();
 
-		protected override void OnDispose(bool calledExplicitly)
+		protected override void OnDispose()
 		{
-			base.OnDispose(calledExplicitly);
-			if (!calledExplicitly) return;
+			base.OnDispose();
+
 			_bin.Writer.TryComplete();
 			_bin = null;
 		}

source/RecyclerBase.cs

@@ -43,10 +43,10 @@ public Task Close()
 			return Completion;
 		}
 
-		protected override void OnDispose(bool calledExplicitly)
+		protected override void OnDispose()
 		{
 			OnCloseRequested();
-			if (calledExplicitly) Target = null;
+			Target = null;
 		}
 	}
 

source/TrimmableCollectionObjectPoolBase.cs

@@ -19,10 +19,10 @@ protected TrimmableCollectionObjectPoolBase(TCollection pool, Func<T> factory, A
 
 		public override int Count => (Pool?.Count ?? 0) + PocketCount;
 
-		protected override void OnDispose(bool calledExplicitly)
+		protected override void OnDispose()
 		{
-			base.OnDispose(calledExplicitly); // Do not call because the following is more optimized.
-			if (calledExplicitly) Pool = null;
+			base.OnDispose();
+			Pool = null;
 		}
 	}
 
@@ -34,30 +34,27 @@ public abstract class TrimmableGenericCollectionObjectPoolBase<T, TCollection> :
 		protected TrimmableGenericCollectionObjectPoolBase(TCollection pool, Func<T> factory, Action<T> recycler, Action<T> disposer, int capacity = DEFAULT_CAPACITY, bool countTrackingEnabled = true)
 			: base(factory, recycler, disposer, capacity, countTrackingEnabled)
 		{
-			Pool = pool;
+			Pool = pool ?? throw new ArgumentNullException(nameof(pool)); ;
 		}
 
 		protected TCollection Pool;
 
 		public override int Count => Pool?.Count ?? 0;
 
-		protected override void OnDispose(bool calledExplicitly)
+		protected override void OnDispose()
 		{
-			//base.OnDispose(calledExplicitly); // Do not call because the following is more optimized.
+			//base.OnDispose(); // Do not call because the following is more optimized.
 
-			if (calledExplicitly)
-			{
-				var p = Pool;
-				Pool = null;
-
-				if (OnDiscarded != null)
-				{
-					foreach (var item in p)
-						OnDiscarded(item);
-				}
+			var p = Pool;
+			Pool = null;
 
-				p.Clear();
+			if (OnDiscarded != null)
+			{
+				foreach (var item in p)
+					OnDiscarded(item);
 			}
+
+			p.Clear();
 		}
 	}