mlemanczyk/Recyclable.Collections
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small cleanup

Browse Source
This commit is contained in:
mlemanczyk committed 2023-09-16 20:33:11 +02:00
1 parent 9f5871829d
commit 2e1abeaab9
14 files changed
+33 -47
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Recyclable.Collections.Benchmarks/Benchmarks/AddRangeWhenSourceIsSameType.cs
+1 -1
View File
@@ -21,7 +21,7 @@ namespace Recyclable.Collections.Benchmarks
public void RecyclableLongList_AddRangeWhenSourceIsRecyclableLongList() public void RecyclableLongList_AddRangeWhenSourceIsRecyclableLongList()
{ {
var data = TestObjectsAsRecyclableList; var data = TestObjectsAsRecyclableList;
using var list = new RecyclableLongList<long>(minBlockSize: BlockSize, expectedItemsCount: TestObjectCount); using var list = new RecyclableLongList<long>(minBlockSize: BlockSize, initialCapacity: TestObjectCount);
list.AddRange(data); list.AddRange(data);
} }
} }
Recyclable.Collections.Benchmarks/Benchmarks/AddRange_WithCapacity.cs
+1 -1
View File
@@ -40,7 +40,7 @@ namespace Recyclable.Collections.Benchmarks
{ {
var data = TestObjects; var data = TestObjects;
var dataCount = TestObjectCount; var dataCount = TestObjectCount;
using var list = new RecyclableLongList<long>(minBlockSize: BlockSize, expectedItemsCount: dataCount); using var list = new RecyclableLongList<long>(minBlockSize: BlockSize, initialCapacity: dataCount);
list.AddRange(data); list.AddRange(data);
} }
} }
Recyclable.Collections.Benchmarks/Benchmarks/Add_WithCapacity.cs
+1 -1
View File
@@ -41,7 +41,7 @@ namespace Recyclable.Collections.Benchmarks
{ {
var data = TestObjects; var data = TestObjects;
var dataCount = TestObjectCount; var dataCount = TestObjectCount;
using var list = new RecyclableLongList<long>(minBlockSize: BlockSize, expectedItemsCount: dataCount); using var list = new RecyclableLongList<long>(minBlockSize: BlockSize, initialCapacity: dataCount);
for (var i = 0; i < dataCount; i++) for (var i = 0; i < dataCount; i++)
{ {
list.Add(data[i]); list.Add(data[i]);
Recyclable.Collections.Benchmarks/Benchmarks/Create_WithCapacity.cs
+1 -1
View File
@@ -30,7 +30,7 @@ namespace Recyclable.Collections.Benchmarks
public void RecyclableLongList_Create_WithCapacity() public void RecyclableLongList_Create_WithCapacity()
{ {
using var list = new RecyclableLongList<long>(minBlockSize: BlockSize, expectedItemsCount: TestObjectCount); using var list = new RecyclableLongList<long>(minBlockSize: BlockSize, initialCapacity: TestObjectCount);
DoNothing(list); DoNothing(list);
} }
} }
Recyclable.Collections.Benchmarks/Benchmarks/RemoveAt_FirstItems.cs
+1 -1
View File
@@ -40,7 +40,7 @@ namespace Recyclable.Collections.Benchmarks
public void RecyclableLongList_RemoveAt_FirstItems() public void RecyclableLongList_RemoveAt_FirstItems()
{ {
var data = TestObjects; var data = TestObjects;
using var list = new RecyclableLongList<long>(data, minBlockSize: BlockSize, expectedItemsCount: TestObjectCount); using var list = new RecyclableLongList<long>(data, minBlockSize: BlockSize, initialCapacity: base.TestObjectCount);
var dataCount = TestObjectCount / 10 > 0 ? TestObjectCount / 10 : TestObjectCount; var dataCount = TestObjectCount / 10 > 0 ? TestObjectCount / 10 : TestObjectCount;
for (var i = 0; i < dataCount; i++) for (var i = 0; i < dataCount; i++)
{ {
Recyclable.Collections.Benchmarks/Benchmarks/RemoveAt_LastItems.cs
+1 -1
View File
@@ -40,7 +40,7 @@ namespace Recyclable.Collections.Benchmarks
public void RecyclableLongList_RemoveAt_LastItems() public void RecyclableLongList_RemoveAt_LastItems()
{ {
var data = TestObjects; var data = TestObjects;
using var list = new RecyclableLongList<long>(data, minBlockSize: BlockSize, expectedItemsCount: TestObjectCount); using var list = new RecyclableLongList<long>(data, minBlockSize: BlockSize, initialCapacity: base.TestObjectCount);
var dataCount = TestObjectCount / 10 > 0 ? TestObjectCount / 10 : TestObjectCount; var dataCount = TestObjectCount / 10 > 0 ? TestObjectCount / 10 : TestObjectCount;
for (var i = data.Length - 1; i > data.Length - dataCount - 1; i--) for (var i = data.Length - 1; i > data.Length - dataCount - 1; i--)
{ {
Recyclable.Collections.Benchmarks/Benchmarks/Remove_FirstItems.cs
+1 -1
View File
@@ -40,7 +40,7 @@ namespace Recyclable.Collections.Benchmarks
public void RecyclableLongList_Remove_FirstItems() public void RecyclableLongList_Remove_FirstItems()
{ {
var data = TestObjects; var data = TestObjects;
using var list = new RecyclableLongList<long>(data, minBlockSize: BlockSize, expectedItemsCount: TestObjectCount); using var list = new RecyclableLongList<long>(data, minBlockSize: BlockSize, initialCapacity: base.TestObjectCount);
var dataCount = TestObjectCount / 10 > 0 ? TestObjectCount / 10 : TestObjectCount; var dataCount = TestObjectCount / 10 > 0 ? TestObjectCount / 10 : TestObjectCount;
for (var i = 0; i < dataCount; i++) for (var i = 0; i < dataCount; i++)
{ {
Recyclable.Collections.Benchmarks/Benchmarks/Remove_LastItems.cs
+1 -1
View File
@@ -40,7 +40,7 @@ namespace Recyclable.Collections.Benchmarks
public void RecyclableLongList_Remove_LastItems() public void RecyclableLongList_Remove_LastItems()
{ {
var data = TestObjects; var data = TestObjects;
using var list = new RecyclableLongList<long>(data, minBlockSize: BlockSize, expectedItemsCount: TestObjectCount); using var list = new RecyclableLongList<long>(data, minBlockSize: BlockSize, initialCapacity:base.TestObjectCount);
var dataCount = TestObjectCount / 10 > 0 ? TestObjectCount / 10 : TestObjectCount; var dataCount = TestObjectCount / 10 > 0 ? TestObjectCount / 10 : TestObjectCount;
for (var i = data.Length - 1; i > data.Length - dataCount - 1; i--) for (var i = data.Length - 1; i > data.Length - dataCount - 1; i--)
{ {
Recyclable.Collections.Benchmarks/POC/RecyclableLongListPoc.Benchmarks.EnsureCapacity.cs
+15 -15
View File
@@ -357,16 +357,16 @@ namespace Recyclable.Collections.Benchmarks.POC
return newCapacity; return newCapacity;
} }
public RecyclableLongListV1(int minBlockSize = RecyclableDefaults.BlockSize, long? expectedItemsCount = default, ArrayPool<T[]>? memoryBlocksPool = default, ArrayPool<T>? blockArrayPool = default) public RecyclableLongListV1(int minBlockSize = RecyclableDefaults.BlockSize, long? initialCapacity = default, ArrayPool<T[]>? memoryBlocksPool = default, ArrayPool<T>? blockArrayPool = default)
{ {
memoryBlocksPool ??= _defaultMemoryBlocksPool; memoryBlocksPool ??= _defaultMemoryBlocksPool;
blockArrayPool ??= _defaultBlockArrayPool; blockArrayPool ??= _defaultBlockArrayPool;
_memoryBlocksPool = memoryBlocksPool; _memoryBlocksPool = memoryBlocksPool;
_blockArrayPool = blockArrayPool; _blockArrayPool = blockArrayPool;
if (expectedItemsCount > 0) if (initialCapacity > 0)
{ {
_capacity = Resize(ref _memoryBlocks, (int)BitOperations.RoundUpToPowerOf2((uint)minBlockSize), 0, expectedItemsCount.Value, memoryBlocksPool, blockArrayPool); _capacity = Resize(ref _memoryBlocks, (int)BitOperations.RoundUpToPowerOf2((uint)minBlockSize), 0, initialCapacity.Value, memoryBlocksPool, blockArrayPool);
if (_memoryBlocks!.Length > 0) if (_memoryBlocks!.Length > 0)
{ {
minBlockSize = _memoryBlocks[0].Length; minBlockSize = _memoryBlocks[0].Length;
@@ -383,16 +383,16 @@ namespace Recyclable.Collections.Benchmarks.POC
} }
} }
public RecyclableLongListV1(IEnumerable<T> source, int minBlockSize = RecyclableDefaults.BlockSize, long? expectedItemsCount = default, ArrayPool<T[]>? memoryBlocksPool = default, ArrayPool<T>? blockArrayPool = default) public RecyclableLongListV1(IEnumerable<T> source, int minBlockSize = RecyclableDefaults.BlockSize, long? initialCapacity = default, ArrayPool<T[]>? memoryBlocksPool = default, ArrayPool<T>? blockArrayPool = default)
{ {
memoryBlocksPool ??= _defaultMemoryBlocksPool; memoryBlocksPool ??= _defaultMemoryBlocksPool;
blockArrayPool ??= _defaultBlockArrayPool; blockArrayPool ??= _defaultBlockArrayPool;
_memoryBlocksPool = memoryBlocksPool; _memoryBlocksPool = memoryBlocksPool;
_blockArrayPool = blockArrayPool; _blockArrayPool = blockArrayPool;
if (expectedItemsCount > 0) if (initialCapacity > 0)
{ {
_capacity = Resize(ref _memoryBlocks, (int)BitOperations.RoundUpToPowerOf2((uint)minBlockSize), 0, expectedItemsCount.Value, memoryBlocksPool, blockArrayPool); _capacity = Resize(ref _memoryBlocks, (int)BitOperations.RoundUpToPowerOf2((uint)minBlockSize), 0, initialCapacity.Value, memoryBlocksPool, blockArrayPool);
if (_memoryBlocks!.Length > 0) if (_memoryBlocks!.Length > 0)
{ {
minBlockSize = _memoryBlocks[0].Length; minBlockSize = _memoryBlocks[0].Length;
@@ -1241,16 +1241,16 @@ namespace Recyclable.Collections.Benchmarks.POC
[MethodImpl(MethodImplOptions.AggressiveOptimization)] [MethodImpl(MethodImplOptions.AggressiveOptimization)]
#pragma warning disable CS8618 // It's set by SetupBlockArrayPooling #pragma warning disable CS8618 // It's set by SetupBlockArrayPooling
public RecyclableLongListV3(ref OneSizeArrayPool<T> blockArrayPool, int minBlockSize = RecyclableDefaults.BlockSize, long? expectedItemsCount = default, ArrayPool<T[]>? memoryBlocksPool = default) public RecyclableLongListV3(ref OneSizeArrayPool<T> blockArrayPool, int minBlockSize = RecyclableDefaults.BlockSize, long? initialCapacity = default, ArrayPool<T[]>? memoryBlocksPool = default)
#pragma warning restore CS8618 #pragma warning restore CS8618
{ {
_memoryBlocksPool = memoryBlocksPool ?? _defaultMemoryBlocksPool; _memoryBlocksPool = memoryBlocksPool ?? _defaultMemoryBlocksPool;
if (expectedItemsCount > 0) if (initialCapacity > 0)
{ {
minBlockSize = checked((int)BitOperations.RoundUpToPowerOf2((uint)minBlockSize)); minBlockSize = checked((int)BitOperations.RoundUpToPowerOf2((uint)minBlockSize));
SetupBlockArrayPooling(this, minBlockSize, ref blockArrayPool); SetupBlockArrayPooling(this, minBlockSize, ref blockArrayPool);
_capacity = Resize(this, minBlockSize, _blockSizePow2Shift, expectedItemsCount.Value); _capacity = Resize(this, minBlockSize, _blockSizePow2Shift, initialCapacity.Value);
if (_blockSize != _memoryBlocks![0].Length && _capacity > 0) if (_blockSize != _memoryBlocks![0].Length && _capacity > 0)
{ {
SetupBlockArrayPooling(this, _memoryBlocks[0].Length, ref blockArrayPool); SetupBlockArrayPooling(this, _memoryBlocks[0].Length, ref blockArrayPool);
@@ -1270,15 +1270,15 @@ namespace Recyclable.Collections.Benchmarks.POC
} }
#pragma warning disable CS8618 // It's set by SetupBlockArrayPooling #pragma warning disable CS8618 // It's set by SetupBlockArrayPooling
public RecyclableLongListV3(ref OneSizeArrayPool<T> blockArrayPool, IEnumerable<T> source, int minBlockSize = RecyclableDefaults.BlockSize, long? expectedItemsCount = default, ArrayPool<T[]>? memoryBlocksPool = default) public RecyclableLongListV3(ref OneSizeArrayPool<T> blockArrayPool, IEnumerable<T> source, int minBlockSize = RecyclableDefaults.BlockSize, long? initialCapacity = default, ArrayPool<T[]>? memoryBlocksPool = default)
#pragma warning restore CS8618 #pragma warning restore CS8618
{ {
_memoryBlocksPool = memoryBlocksPool ?? _defaultMemoryBlocksPool; _memoryBlocksPool = memoryBlocksPool ?? _defaultMemoryBlocksPool;
if (expectedItemsCount > 0) if (initialCapacity > 0)
{ {
minBlockSize = checked((int)BitOperations.RoundUpToPowerOf2((uint)minBlockSize)); minBlockSize = checked((int)BitOperations.RoundUpToPowerOf2((uint)minBlockSize));
SetupBlockArrayPooling(this, minBlockSize, ref blockArrayPool); SetupBlockArrayPooling(this, minBlockSize, ref blockArrayPool);
_capacity = Resize(this, minBlockSize, _blockSizePow2Shift, expectedItemsCount.Value); _capacity = Resize(this, minBlockSize, _blockSizePow2Shift, initialCapacity.Value);
if (minBlockSize != _memoryBlocks![0].Length && _capacity > 0) if (minBlockSize != _memoryBlocks![0].Length && _capacity > 0)
{ {
SetupBlockArrayPooling(this, _memoryBlocks[0].Length, ref blockArrayPool); SetupBlockArrayPooling(this, _memoryBlocks[0].Length, ref blockArrayPool);
@@ -1843,19 +1843,19 @@ namespace Recyclable.Collections.Benchmarks.POC
{ {
public void RecyclableLongList_EnsureCapacityV1_ByPowOf2() public void RecyclableLongList_EnsureCapacityV1_ByPowOf2()
{ {
using var list = new RecyclableLongListV1<long>(minBlockSize: BlockSize, expectedItemsCount: TestObjectCount); using var list = new RecyclableLongListV1<long>(minBlockSize: BlockSize, initialCapacity: TestObjectCount);
DoNothing(_ensureCapacityV1Func.Invoke(list, new object[] { TestObjectCount })); DoNothing(_ensureCapacityV1Func.Invoke(list, new object[] { TestObjectCount }));
} }
public void RecyclableLongList_EnsureCapacityV3_ByPowOf2() public void RecyclableLongList_EnsureCapacityV3_ByPowOf2()
{ {
using var list = new RecyclableLongListV3<long>(ref RecyclableArrayPool<long>._pools[BlockSize], minBlockSize: BlockSize, expectedItemsCount: TestObjectCount); using var list = new RecyclableLongListV3<long>(ref RecyclableArrayPool<long>._pools[BlockSize], minBlockSize: BlockSize, initialCapacity: TestObjectCount);
DoNothing(_ensureCapacityV3Func.Invoke(null, new object[] { list, TestObjectCount })); DoNothing(_ensureCapacityV3Func.Invoke(null, new object[] { list, TestObjectCount }));
} }
public void RecyclableLongList_EnsureCapacity_ByPowOf2() public void RecyclableLongList_EnsureCapacity_ByPowOf2()
{ {
using var list = new RecyclableLongList<long>(minBlockSize: BlockSize, expectedItemsCount: TestObjectCount); using var list = new RecyclableLongList<long>(minBlockSize: BlockSize, initialCapacity: TestObjectCount);
DoNothing(_ensureCapacityNewFunc.Invoke(null, new object[] { list, TestObjectCount })); DoNothing(_ensureCapacityNewFunc.Invoke(null, new object[] { list, TestObjectCount }));
} }
Recyclable.Collections.Benchmarks/RecyclableBenchmarkBase.cs
+1 -1
View File
@@ -72,7 +72,7 @@ namespace Recyclable.Collections.Benchmarks
break; break;
case RecyclableCollectionsBenchmarkSource.RecyclableLongList: case RecyclableCollectionsBenchmarkSource.RecyclableLongList:
_testObjectsAsRecyclableLongList ??= new(TestObjects, BlockSize, expectedItemsCount: TestObjectCount); _testObjectsAsRecyclableLongList ??= new(TestObjects, BlockSize, initialCapacity: base.TestObjectCount);
break; break;
default: default:
Recyclable.Collections/MathUtils.cs
-8
View File
@@ -5,14 +5,6 @@ namespace Recyclable.Collections
{ {
internal static class MathUtils internal static class MathUtils
{ {
// private static readonly long[] Pow2 = new long[]
// {
// 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384,
// 32768, 65536, 131072, 262144, 524288, 1048576, 2097152, 4194304,
// 8388608, 16777216, 33554432, 67108864, 134217728, 268435456,
// 536870912, 1073741824, 2147483648
// };
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public static bool IsPow2(long value) => (value != 0) && ((value & (value - 1)) == 0); public static bool IsPow2(long value) => (value != 0) && ((value & (value - 1)) == 0);
Recyclable.Collections/RecyclableList.Helpers.cs
-1
View File
@@ -124,7 +124,6 @@ namespace Recyclable.Collections
// Array.Clear(source); // Array.Clear(source);
//} //}
// // If anything, it has been already cleared above, so we don't need to repeat it.
RecyclableArrayPool<T>.ReturnShared(oldMemoryBlock, NeedsClearing); RecyclableArrayPool<T>.ReturnShared(oldMemoryBlock, NeedsClearing);
} }
} }
Recyclable.Collections/RecyclableLongList.IndexOfHelpers.cs
-2
View File
@@ -344,8 +344,6 @@ namespace Recyclable.Collections
return itemIndex >= 0 ? itemIndex + ((long)list._lastBlockWithData << list._blockSizePow2BitShift) : RecyclableDefaults.ItemNotFoundIndexLong; return itemIndex >= 0 ? itemIndex + ((long)list._lastBlockWithData << list._blockSizePow2BitShift) : RecyclableDefaults.ItemNotFoundIndexLong;
} }
public static int Min(int a, int b, int c) => a < b ? a < c ? a : c : b < c ? b : c;
} }
} }
} }
Recyclable.Collections/RecyclableLongList.cs
+9 -12
View File
@@ -10,9 +10,6 @@ namespace Recyclable.Collections
{ {
public partial class RecyclableLongList<T> : IList<T>, IReadOnlyList<T>, IDisposable public partial class RecyclableLongList<T> : IList<T>, IReadOnlyList<T>, IDisposable
{ {
#pragma warning disable CA1825
private static readonly T[][] _emptyMemoryBlocksArray = new T[0][];
#pragma warning restore CA1825
private static readonly bool _defaultIsNull = default(T) == null; private static readonly bool _defaultIsNull = default(T) == null;
private static readonly bool _needsClearing = !typeof(T).IsValueType; private static readonly bool _needsClearing = !typeof(T).IsValueType;
@@ -167,14 +164,14 @@ namespace Recyclable.Collections
} }
[MethodImpl(MethodImplOptions.AggressiveOptimization)] [MethodImpl(MethodImplOptions.AggressiveOptimization)]
public RecyclableLongList(int minBlockSize = RecyclableDefaults.BlockSize, long? expectedItemsCount = default) public RecyclableLongList(int minBlockSize = RecyclableDefaults.BlockSize, long? initialCapacity = default)
{ {
minBlockSize = checked((int)BitOperations.RoundUpToPowerOf2((uint)minBlockSize)); minBlockSize = checked((int)BitOperations.RoundUpToPowerOf2((uint)minBlockSize));
if (expectedItemsCount > 0) if (initialCapacity > 0)
{ {
Helpers.SetupBlockArrayPooling(this, minBlockSize); Helpers.SetupBlockArrayPooling(this, minBlockSize);
_capacity = Helpers.Resize(this, minBlockSize, _blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)expectedItemsCount.Value))); _capacity = Helpers.Resize(this, minBlockSize, _blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)initialCapacity.Value)));
_blockSizeMinus1 = minBlockSize - 1; _blockSizeMinus1 = minBlockSize - 1;
} }
else else
@@ -295,12 +292,12 @@ namespace Recyclable.Collections
AddRange(source); AddRange(source);
} }
public RecyclableLongList(IEnumerable source, int minBlockSize = RecyclableDefaults.BlockSize, long? expectedItemsCount = default) public RecyclableLongList(IEnumerable source, int minBlockSize = RecyclableDefaults.BlockSize, long? initialCapacity = default)
{ {
Helpers.SetupBlockArrayPooling(this, minBlockSize = checked((int)BitOperations.RoundUpToPowerOf2((uint)minBlockSize))); Helpers.SetupBlockArrayPooling(this, minBlockSize = checked((int)BitOperations.RoundUpToPowerOf2((uint)minBlockSize)));
if (expectedItemsCount > 0) if (initialCapacity > 0)
{ {
_capacity = Helpers.Resize(this, minBlockSize, _blockSizePow2BitShift, checked((int)BitOperations.RoundUpToPowerOf2((uint)expectedItemsCount.Value))); _capacity = Helpers.Resize(this, minBlockSize, _blockSizePow2BitShift, checked((int)BitOperations.RoundUpToPowerOf2((uint)initialCapacity.Value)));
_blockSizeMinus1 = minBlockSize - 1; _blockSizeMinus1 = minBlockSize - 1;
} }
else else
@@ -312,12 +309,12 @@ namespace Recyclable.Collections
AddRange(source); AddRange(source);
} }
public RecyclableLongList(IEnumerable<T> source, int minBlockSize = RecyclableDefaults.BlockSize, long? expectedItemsCount = default) public RecyclableLongList(IEnumerable<T> source, int minBlockSize = RecyclableDefaults.BlockSize, long? initialCapacity = default)
{ {
Helpers.SetupBlockArrayPooling(this, minBlockSize = checked((int)BitOperations.RoundUpToPowerOf2((uint)minBlockSize))); Helpers.SetupBlockArrayPooling(this, minBlockSize = checked((int)BitOperations.RoundUpToPowerOf2((uint)minBlockSize)));
if (expectedItemsCount > 0) if (initialCapacity > 0)
{ {
_capacity = Helpers.Resize(this, minBlockSize, _blockSizePow2BitShift, checked((int)BitOperations.RoundUpToPowerOf2((uint)expectedItemsCount.Value))); _capacity = Helpers.Resize(this, minBlockSize, _blockSizePow2BitShift, checked((int)BitOperations.RoundUpToPowerOf2((uint)initialCapacity.Value)));
_blockSizeMinus1 = minBlockSize - 1; _blockSizeMinus1 = minBlockSize - 1;
} }
else else