Browse Source

Add compiler directives

pull/2025/head^2
James Jackson-South 4 years ago
parent
commit
5b82c57ce7
  1. 7
      src/ImageSharp/Memory/Allocators/UniformUnmanagedMemoryPoolMemoryAllocator.cs
  2. 2
      tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedPoolMemoryAllocatorTests.cs

7
src/ImageSharp/Memory/Allocators/UniformUnmanagedMemoryPoolMemoryAllocator.cs

@ -1,11 +1,10 @@
// Copyright (c) Six Labors. // Copyright (c) Six Labors.
// Licensed under the Apache License, Version 2.0. // Licensed under the Apache License, Version 2.0.
using System; using System;
using System.Buffers; using System.Buffers;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Threading;
using SixLabors.ImageSharp.Memory.Internals; using SixLabors.ImageSharp.Memory.Internals;
namespace SixLabors.ImageSharp.Memory namespace SixLabors.ImageSharp.Memory
@ -22,7 +21,7 @@ namespace SixLabors.ImageSharp.Memory
private readonly int poolCapacity; private readonly int poolCapacity;
private readonly UniformUnmanagedMemoryPool.TrimSettings trimSettings; private readonly UniformUnmanagedMemoryPool.TrimSettings trimSettings;
private UniformUnmanagedMemoryPool pool; private readonly UniformUnmanagedMemoryPool pool;
private readonly UnmanagedMemoryAllocator nonPoolAllocator; private readonly UnmanagedMemoryAllocator nonPoolAllocator;
public UniformUnmanagedMemoryPoolMemoryAllocator(int? maxPoolSizeMegabytes) public UniformUnmanagedMemoryPoolMemoryAllocator(int? maxPoolSizeMegabytes)
@ -74,9 +73,11 @@ namespace SixLabors.ImageSharp.Memory
this.nonPoolAllocator = new UnmanagedMemoryAllocator(unmanagedBufferSizeInBytes); this.nonPoolAllocator = new UnmanagedMemoryAllocator(unmanagedBufferSizeInBytes);
} }
#if NETCOREAPP3_1_OR_GREATER
// This delegate allows overriding the method returning the available system memory, // This delegate allows overriding the method returning the available system memory,
// so we can test our workaround for https://github.com/dotnet/runtime/issues/65466 // so we can test our workaround for https://github.com/dotnet/runtime/issues/65466
internal static Func<long> GetTotalAvailableMemoryBytes { get; set; } = () => GC.GetGCMemoryInfo().TotalAvailableMemoryBytes; internal static Func<long> GetTotalAvailableMemoryBytes { get; set; } = () => GC.GetGCMemoryInfo().TotalAvailableMemoryBytes;
#endif
/// <inheritdoc /> /// <inheritdoc />
protected internal override int GetBufferCapacityInBytes() => this.poolBufferSizeInBytes; protected internal override int GetBufferCapacityInBytes() => this.poolBufferSizeInBytes;

2
tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedPoolMemoryAllocatorTests.cs

@ -380,6 +380,7 @@ namespace SixLabors.ImageSharp.Tests.Memory.Allocators
} }
} }
#if NETCOREAPP3_1_OR_GREATER
[Fact] [Fact]
public void Issue2001_NegativeMemoryReportedByGc() public void Issue2001_NegativeMemoryReportedByGc()
{ {
@ -392,5 +393,6 @@ namespace SixLabors.ImageSharp.Tests.Memory.Allocators
_ = MemoryAllocator.Create(); _ = MemoryAllocator.Create();
} }
} }
#endif
} }
} }

Loading…
Cancel
Save