From 85cd6793818a3edd0a963bb4829a960ee6b0e022 Mon Sep 17 00:00:00 2001 From: vnugent Date: Mon, 15 Jul 2024 18:58:06 -0400 Subject: chore: Just some minor checks and adjustments --- lib/Utils/src/Memory/MemoryUtil.CopyUtilCore.cs | 2 +- lib/Utils/src/Memory/MemoryUtil.cs | 43 +++++++++---------------- lib/Utils/src/Memory/UnsafeMemoryHandle.cs | 4 +-- 3 files changed, 19 insertions(+), 30 deletions(-) (limited to 'lib/Utils') diff --git a/lib/Utils/src/Memory/MemoryUtil.CopyUtilCore.cs b/lib/Utils/src/Memory/MemoryUtil.CopyUtilCore.cs index 9decef7..6899877 100644 --- a/lib/Utils/src/Memory/MemoryUtil.CopyUtilCore.cs +++ b/lib/Utils/src/Memory/MemoryUtil.CopyUtilCore.cs @@ -308,4 +308,4 @@ namespace VNLib.Utils.Memory } } } -} \ No newline at end of file +} diff --git a/lib/Utils/src/Memory/MemoryUtil.cs b/lib/Utils/src/Memory/MemoryUtil.cs index 34489a4..09c36d5 100644 --- a/lib/Utils/src/Memory/MemoryUtil.cs +++ b/lib/Utils/src/Memory/MemoryUtil.cs @@ -519,7 +519,8 @@ namespace VNLib.Utils.Memory /// A pointer to initialized target structure to copy data to /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void CopyStruct(ref readonly byte source, void* target) where T : unmanaged => CopyStruct(in source, (T*)target); + public static void CopyStruct(ref readonly byte source, void* target) where T : unmanaged + => CopyStruct(in source, (T*)target); /// /// Copies structure data from a source sequence of data to the target structure reference. @@ -548,7 +549,8 @@ namespace VNLib.Utils.Memory /// A pointer to initialized target structure to copy data to /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void CopyStruct(ReadOnlySpan sourceData, T* target) where T : unmanaged => CopyStruct(sourceData, ref *target); + public static void CopyStruct(ReadOnlySpan sourceData, T* target) where T : unmanaged + => CopyStruct(sourceData, ref *target); /// /// Copies structure data from a source sequence of data to the target structure reference. @@ -558,7 +560,8 @@ namespace VNLib.Utils.Memory /// A pointer to initialized target structure to copy data to /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void CopyStruct(ReadOnlySpan sourceData, void* target) where T: unmanaged => CopyStruct(sourceData, (T*)target); + public static void CopyStruct(ReadOnlySpan sourceData, void* target) where T: unmanaged + => CopyStruct(sourceData, (T*)target); /// @@ -743,7 +746,7 @@ namespace VNLib.Utils.Memory ref Refs.AsByte(source, (nuint)sourceOffset), ref Refs.AsByte(dest, destOffset), ByteCount((uint)count), - false + forceAcceleration: false ); } @@ -774,7 +777,7 @@ namespace VNLib.Utils.Memory RMemCopyHandle src = new(source, (nuint)sourceOffset); MemhandleCopyHandle dst = new(dest, destOffset); - MemmoveInternal, MemhandleCopyHandle>(in src, in dst, (nuint)count, false); + MemmoveInternal, MemhandleCopyHandle>(in src, in dst, (nuint)count, forceAcceleration: false); } /// @@ -809,7 +812,7 @@ namespace VNLib.Utils.Memory ref Refs.AsByte(source, (nuint)sourceOffset), ref Refs.AsByte(dest, (nuint)destOffset), ByteCount((uint)count), - false + forceAcceleration: false ); } @@ -842,7 +845,7 @@ namespace VNLib.Utils.Memory MemhandleCopyHandle src = new(source, (nuint)sourceOffset); WMemCopyHandle dst = new(dest, (nuint)destOffset); - MemmoveInternal, WMemCopyHandle>(in src, in dst, (nuint)count, false); + MemmoveInternal, WMemCopyHandle>(in src, in dst, (nuint)count, forceAcceleration: false); } /// @@ -872,7 +875,7 @@ namespace VNLib.Utils.Memory MemhandleCopyHandle src = new(source, sourceOffset); MemhandleCopyHandle dst = new(dest, destOffset); - MemmoveInternal, MemhandleCopyHandle>(in src, in dst, count, false); + MemmoveInternal, MemhandleCopyHandle>(in src, in dst, count, forceAcceleration: false); } /// @@ -901,7 +904,7 @@ namespace VNLib.Utils.Memory MemhandleCopyHandle src = new(source, sourceOffset); ArrayCopyHandle dst = new(dest, destOffset); - MemmoveInternal, ArrayCopyHandle>(in src, in dst, count, false); + MemmoveInternal, ArrayCopyHandle>(in src, in dst, count, forceAcceleration: false); } /// @@ -930,7 +933,7 @@ namespace VNLib.Utils.Memory ArrayCopyHandle ach = new(source, sourceOffset); MemhandleCopyHandle mch = new(dest, destOffset); - MemmoveInternal, MemhandleCopyHandle>(in ach, in mch, count, false); + MemmoveInternal, MemhandleCopyHandle>(in ach, in mch, count, forceAcceleration: false); } /// @@ -959,7 +962,7 @@ namespace VNLib.Utils.Memory ArrayCopyHandle srcH = new(source, sourceOffset); ArrayCopyHandle dstH = new(dest, destOffset); - MemmoveInternal, ArrayCopyHandle>(in srcH, in dstH, count, false); + MemmoveInternal, ArrayCopyHandle>(in srcH, in dstH, count, forceAcceleration: false); } /// @@ -1029,7 +1032,7 @@ namespace VNLib.Utils.Memory in Refs.AsByteR(in src, srcOffset), ref Refs.AsByte(ref dst, dstOffset), ByteCount(elementCount), - false + forceAcceleration: false ); } @@ -1332,7 +1335,7 @@ namespace VNLib.Utils.Memory //Pin the array GCHandle arrHandle = GCHandle.Alloc(array, GCHandleType.Pinned); - //safe to get array basee pointer + //safe to get array base pointer ref T arrBase = ref MemoryMarshal.GetArrayDataReference(array); //Get element offset @@ -1574,8 +1577,6 @@ namespace VNLib.Utils.Memory MemoryHandle Pin(); - nuint Size { get; } - nuint Offset { get; } void Validate(nuint count); @@ -1586,9 +1587,6 @@ namespace VNLib.Utils.Memory /// public readonly nuint Offset => offset; - /// - public readonly nuint Size => ByteCount((nuint)array.Length); - /// public readonly MemoryHandle Pin() => PinArrayAndGetHandle(array, 0); @@ -1604,9 +1602,6 @@ namespace VNLib.Utils.Memory /// public readonly nuint Offset => offset; - /// - public readonly nuint Size => ByteCount((nuint)block.Length); - /// public readonly MemoryHandle Pin() => block.Pin(); @@ -1622,9 +1617,6 @@ namespace VNLib.Utils.Memory /// public readonly nuint Offset => offset; - /// - public readonly nuint Size => ByteCount((nuint)block.Length); - /// public readonly MemoryHandle Pin() => block.Pin(); @@ -1640,9 +1632,6 @@ namespace VNLib.Utils.Memory /// public readonly nuint Offset => offset; - /// - public readonly nuint Size => handle.Length; - /// public readonly MemoryHandle Pin() => handle.Pin(0); diff --git a/lib/Utils/src/Memory/UnsafeMemoryHandle.cs b/lib/Utils/src/Memory/UnsafeMemoryHandle.cs index bda8e2e..4041d0b 100644 --- a/lib/Utils/src/Memory/UnsafeMemoryHandle.cs +++ b/lib/Utils/src/Memory/UnsafeMemoryHandle.cs @@ -286,7 +286,7 @@ namespace VNLib.Utils.Memory /// /// /// True if handles are equal, flase otherwise - public static bool operator ==(in UnsafeMemoryHandle left, in UnsafeMemoryHandle right) => left.Equals(right); + public static bool operator ==(in UnsafeMemoryHandle left, in UnsafeMemoryHandle right) => left.Equals(in right); /// /// Equality overload @@ -294,7 +294,7 @@ namespace VNLib.Utils.Memory /// /// /// True if handles are equal, flase otherwise - public static bool operator !=(in UnsafeMemoryHandle left, in UnsafeMemoryHandle right) => !left.Equals(right); + public static bool operator !=(in UnsafeMemoryHandle left, in UnsafeMemoryHandle right) => !left.Equals(in right); } } -- cgit