warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Adds multithread optional flag to ValueStringBuilder (#1033)

Browse source 
Added multithread optional flag to ValueStringBuilder for multithread contexts.
Enabled new flag for VerifyType method.

Resolves #1032
This commit is contained in:
Stefano Merotta 2022-05-27 19:25:30 +02:00 • committed by GitHub
parent ef883b2872
commit fe225003c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Projects/Server/Buffers/ValueStringBuilder.cs
View file

@ -3,6 +3,7 @@
#nullable enable
using System;
using System.Buffers;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
@ -13,35 +14,45 @@ public ref struct ValueStringBuilder
private char[] _arrayToReturnToPool;
private Span<char> _chars;
private int _length;
private bool _mt;
public ValueStringBuilder() : this(64)
private ArrayPool<char> ArrayPool
{
[MethodImpl(MethodImplOptions.AggressiveInlining)]
get => _mt ? ArrayPool<char>.Shared : STArrayPool<char>.Shared;
}
public ValueStringBuilder(bool mt = false) : this(64, mt)
{
}
// If this ctor is used, you cannot pass in stackalloc ROS for append/replace.
public ValueStringBuilder(ReadOnlySpan<char> initialString) : this(initialString.Length)
public ValueStringBuilder(ReadOnlySpan<char> initialString, bool mt = false) : this(initialString.Length, mt)
{
Append(initialString);
}
public ValueStringBuilder(ReadOnlySpan<char> initialString, Span<char> initialBuffer) : this(initialBuffer)
public ValueStringBuilder(ReadOnlySpan<char> initialString, Span<char> initialBuffer, bool mt = false) : this(initialBuffer, mt)
{
Append(initialString);
}
public ValueStringBuilder(Span<char> initialBuffer)
public ValueStringBuilder(Span<char> initialBuffer, bool mt = false)
{
_mt = mt;
_arrayToReturnToPool = null;
_chars = initialBuffer;
_length = 0;
}
// If this ctor is used, you cannot pass in stackalloc ROS for append/replace.
public ValueStringBuilder(int initialCapacity)
public ValueStringBuilder(int initialCapacity, bool mt = false)
{
_arrayToReturnToPool = STArrayPool<char>.Shared.Rent(initialCapacity);
_mt = mt;
_arrayToReturnToPool = null;
_chars = _arrayToReturnToPool;
_length = 0;
_arrayToReturnToPool = ArrayPool.Rent(initialCapacity);
}
public int Length => _length;
@ -319,7 +330,7 @@ public ref struct ValueStringBuilder
[MethodImpl(MethodImplOptions.NoInlining)]
private void Grow(int additionalCapacityBeyondPos)
{
char[] poolArray = STArrayPool<char>.Shared.Rent(Math.Max(_length + additionalCapacityBeyondPos, _chars.Length * 2));
char[] poolArray = ArrayPool.Rent(Math.Max(_length + additionalCapacityBeyondPos, _chars.Length * 2));
_chars[.._length].CopyTo(poolArray);
@ -327,7 +338,7 @@ public ref struct ValueStringBuilder
_chars = _arrayToReturnToPool = poolArray;
if (toReturn != null)
{
STArrayPool<char>.Shared.Return(toReturn);
ArrayPool.Return(toReturn);
}
}
@ -338,7 +349,7 @@ public ref struct ValueStringBuilder
this = default; // for safety, to avoid using pooled array if this instance is erroneously appended to again
if (toReturn != null)
{
STArrayPool<char>.Shared.Return(toReturn);
ArrayPool.Return(toReturn);
}
}
#nullable restore

2
Projects/Server/Main.cs
View file

@ -607,7 +607,7 @@ namespace Server
Interlocked.Increment(ref _mobileCount);
}
ValueStringBuilder errors = new ValueStringBuilder();
ValueStringBuilder errors = new ValueStringBuilder(true);
try
{