Workaround GC.GetMemoryInfo() ARM32 issue #2025
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -74,6 +74,10 @@ public UniformUnmanagedMemoryPoolMemoryAllocator(int? maxPoolSizeMegabytes) | |||
| this.nonPoolAllocator = new UnmanagedMemoryAllocator(unmanagedBufferSizeInBytes); | |||
| } | |||
|
|
|||
| // 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 | |||
| internal static Func<long> GetTotalAvailableMemoryBytes { get; set; } = () => GC.GetGCMemoryInfo().TotalAvailableMemoryBytes; | |||
There was a problem hiding this comment.
You're missing a condition here.
#if NETCOREAPP3_1_OR_GREATER
There was a problem hiding this comment.
@antonfirsov I've pushed the fix.
There was a problem hiding this comment.
I missed the comment and also pushed it 🙈
There was a problem hiding this comment.
Doubled fixed now then. We know it's good 😄
…hub.com/SixLabors/ImageSharp into af/TotalAvailableMemoryBytes-workaround
JimBobSquarePants
approved these changes
Feb 22, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Prerequisites
Description
Workaround dotnet/runtime#65466 by using the constant fallback pool size if negative memory is reported.
Fixes #2001.