Skip to content

Refactor memory copies in SafeBuffer #105206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkoritzinsky merged 4 commits into from
Oct 15, 2024
Merged

Refactor memory copies in SafeBuffer #105206

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
56671ea
Refactor memory copies in `SafeBuffer`
xtqqczze Jul 21, 2024
3036449
Avoid unnecessary sign-extension
xtqqczze Jul 21, 2024
f5aa156
Remove unnecessary cast
xtqqczze Aug 10, 2024
cb4c24e
Merge branch 'main' into SafeBuffer-Memmove
xtqqczze Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/SafeBuffer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,21 +187,18 @@ public T Read<T>(ulong byteOffset) where T : struct
byte* ptr = (byte*)handle + byteOffset;
SpaceCheck(ptr, sizeofT);

// return *(T*) (_ptr + byteOffset);
T value = default;
bool mustCallRelease = false;
try
{
DangerousAddRef(ref mustCallRelease);

SpanHelpers.Memmove(ref Unsafe.As<T, byte>(ref value), ref *ptr, sizeofT);
return Unsafe.ReadUnaligned<T>(ptr);
Comment thread
tannergooding marked this conversation as resolved.
}
finally
{
if (mustCallRelease)
DangerousRelease();
}
return value;
}

/// <summary>
Expand Down Expand Up @@ -248,7 +245,9 @@ public void ReadSpan<T>(ulong byteOffset, Span<T> buffer)

ref T structure = ref MemoryMarshal.GetReference(buffer);
for (int i = 0; i < buffer.Length; i++)
Buffer.Memmove(ref Unsafe.Add(ref structure, i), ref Unsafe.AsRef<T>(ptr + alignedSizeofT * i), 1);
{
Unsafe.Add(ref structure, (nint)(uint)i) = Unsafe.ReadUnaligned<T>(ptr + alignedSizeofT * (uint)i);
Comment thread
tannergooding marked this conversation as resolved.
}
}
finally
{
Expand All @@ -275,13 +274,12 @@ public void Write<T>(ulong byteOffset, T value) where T : struct
byte* ptr = (byte*)handle + byteOffset;
SpaceCheck(ptr, sizeofT);

// *((T*) (_ptr + byteOffset)) = value;
bool mustCallRelease = false;
try
{
DangerousAddRef(ref mustCallRelease);

SpanHelpers.Memmove(ref *ptr, ref Unsafe.As<T, byte>(ref value), sizeofT);
Unsafe.WriteUnaligned(ptr, value);
}
finally
{
Expand Down Expand Up @@ -336,7 +334,9 @@ public void WriteSpan<T>(ulong byteOffset, ReadOnlySpan<T> data)

ref T structure = ref MemoryMarshal.GetReference(data);
for (int i = 0; i < data.Length; i++)
Buffer.Memmove(ref Unsafe.AsRef<T>(ptr + alignedSizeofT * i), ref Unsafe.Add(ref structure, i), 1);
{
Unsafe.WriteUnaligned(ptr + alignedSizeofT * (uint)i, Unsafe.Add(ref structure, (nint)(uint)i));
}
}
finally
{
Expand Down