From 172b0a0ca2351b9a7c97291112625ab5fa2e1676 Mon Sep 17 00:00:00 2001 From: Anton Firszov Date: Sun, 8 Aug 2021 20:16:06 +0200 Subject: [PATCH] MinimumContiguousBlockBytes -> MinimumContiguousBlockSizeBytes --- src/ImageSharp/Memory/Allocators/MemoryAllocator.cs | 2 +- .../Memory/Allocators/MemoryAllocatorOptions.cs | 8 ++++---- .../LoadResizeSave/LoadResizeSaveStressBenchmarks.cs | 6 +++--- .../ImageSharp.Tests/Image/LargeImageIntegrationTests.cs | 2 +- .../UniformUnmanagedPoolMemoryAllocatorTests.cs | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/ImageSharp/Memory/Allocators/MemoryAllocator.cs b/src/ImageSharp/Memory/Allocators/MemoryAllocator.cs index 840e07d1ad..6be5c50fa2 100644 --- a/src/ImageSharp/Memory/Allocators/MemoryAllocator.cs +++ b/src/ImageSharp/Memory/Allocators/MemoryAllocator.cs @@ -30,7 +30,7 @@ namespace SixLabors.ImageSharp.Memory /// The . /// The . public static MemoryAllocator CreateDefault(MemoryAllocatorOptions options) => - new UniformUnmanagedMemoryPoolMemoryAllocator(options.MaximumPoolSizeMegabytes, options.MinimumContiguousBlockBytes); + new UniformUnmanagedMemoryPoolMemoryAllocator(options.MaximumPoolSizeMegabytes, options.MinimumContiguousBlockSizeBytes); /// /// Allocates an , holding a of length . diff --git a/src/ImageSharp/Memory/Allocators/MemoryAllocatorOptions.cs b/src/ImageSharp/Memory/Allocators/MemoryAllocatorOptions.cs index 8ea7f6f7b9..acdf36c6a1 100644 --- a/src/ImageSharp/Memory/Allocators/MemoryAllocatorOptions.cs +++ b/src/ImageSharp/Memory/Allocators/MemoryAllocatorOptions.cs @@ -9,7 +9,7 @@ namespace SixLabors.ImageSharp.Memory public class MemoryAllocatorOptions { private int? maximumPoolSizeMegabytes; - private int? minimumContiguousBlockBytes; + private int? minimumContiguousBlockSizeBytes; /// /// Gets or sets a value defining the maximum size of the 's internal memory pool @@ -38,9 +38,9 @@ namespace SixLabors.ImageSharp.Memory /// Overriding this value is useful for interop scenarios /// ensuring succeeds. /// - public int? MinimumContiguousBlockBytes + public int? MinimumContiguousBlockSizeBytes { - get => this.minimumContiguousBlockBytes; + get => this.minimumContiguousBlockSizeBytes; set { if (value.HasValue) @@ -50,7 +50,7 @@ namespace SixLabors.ImageSharp.Memory Guard.MustBeGreaterThanOrEqualTo(value.Value, 65536, nameof(this.MaximumPoolSizeMegabytes)); } - this.minimumContiguousBlockBytes = value; + this.minimumContiguousBlockSizeBytes = value; } } } diff --git a/tests/ImageSharp.Benchmarks/LoadResizeSave/LoadResizeSaveStressBenchmarks.cs b/tests/ImageSharp.Benchmarks/LoadResizeSave/LoadResizeSaveStressBenchmarks.cs index d3191c6955..c573c95ce2 100644 --- a/tests/ImageSharp.Benchmarks/LoadResizeSave/LoadResizeSaveStressBenchmarks.cs +++ b/tests/ImageSharp.Benchmarks/LoadResizeSave/LoadResizeSaveStressBenchmarks.cs @@ -48,9 +48,9 @@ namespace SixLabors.ImageSharp.Benchmarks.LoadResizeSave public int[] ParallelismValues { get; } = { Environment.ProcessorCount, - Environment.ProcessorCount / 2, - Environment.ProcessorCount / 4, - 1 + // Environment.ProcessorCount / 2, + // Environment.ProcessorCount / 4, + // 1 }; [Benchmark(Baseline = true)] diff --git a/tests/ImageSharp.Tests/Image/LargeImageIntegrationTests.cs b/tests/ImageSharp.Tests/Image/LargeImageIntegrationTests.cs index 240c9f5689..f4d082b9b7 100644 --- a/tests/ImageSharp.Tests/Image/LargeImageIntegrationTests.cs +++ b/tests/ImageSharp.Tests/Image/LargeImageIntegrationTests.cs @@ -30,7 +30,7 @@ namespace SixLabors.ImageSharp.Tests { Configuration.Default.MemoryAllocator = MemoryAllocator.CreateDefault(new MemoryAllocatorOptions() { - MinimumContiguousBlockBytes = sizeof(Rgba32) * 8192 * 4096 + MinimumContiguousBlockSizeBytes = sizeof(Rgba32) * 8192 * 4096 }); using Image image = new Image(8192, 4096); Assert.True(image.TryGetSinglePixelSpan(out Span span)); diff --git a/tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedPoolMemoryAllocatorTests.cs b/tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedPoolMemoryAllocatorTests.cs index a872deef05..3557c241ea 100644 --- a/tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedPoolMemoryAllocatorTests.cs +++ b/tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedPoolMemoryAllocatorTests.cs @@ -158,7 +158,7 @@ namespace SixLabors.ImageSharp.Tests.Memory.Allocators var allocator = MemoryAllocator.CreateDefault(new MemoryAllocatorOptions() { MaximumPoolSizeMegabytes = bool.Parse(poolAllocationStr) ? 64 : 0, - MinimumContiguousBlockBytes = fortyEightMegabytes + MinimumContiguousBlockSizeBytes = fortyEightMegabytes }); MemoryGroup g = allocator.AllocateGroup(fortyEightMegabytes, 1024);