aboutsummaryrefslogtreecommitdiff
path: root/lib/Utils
diff options
context:
space:
mode:
authorLibravatar vnugent <public@vaughnnugent.com>2024-07-15 18:58:06 -0400
committerLibravatar vnugent <public@vaughnnugent.com>2024-07-15 18:58:06 -0400
commit85cd6793818a3edd0a963bb4829a960ee6b0e022 (patch)
tree3e852301428555e9964875884072dc5d0994cfe0 /lib/Utils
parentabfb5761ee381b7e1e5342a5525ceca8c8fd81dd (diff)
chore: Just some minor checks and adjustments
Diffstat (limited to 'lib/Utils')
-rw-r--r--lib/Utils/src/Memory/MemoryUtil.CopyUtilCore.cs2
-rw-r--r--lib/Utils/src/Memory/MemoryUtil.cs43
-rw-r--r--lib/Utils/src/Memory/UnsafeMemoryHandle.cs4
3 files changed, 19 insertions, 30 deletions
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
/// <param name="target">A pointer to initialized target structure to copy data to</param>
/// <exception cref="ArgumentNullException"></exception>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public static void CopyStruct<T>(ref readonly byte source, void* target) where T : unmanaged => CopyStruct(in source, (T*)target);
+ public static void CopyStruct<T>(ref readonly byte source, void* target) where T : unmanaged
+ => CopyStruct(in source, (T*)target);
/// <summary>
/// Copies structure data from a source sequence of data to the target structure reference.
@@ -548,7 +549,8 @@ namespace VNLib.Utils.Memory
/// <param name="target">A pointer to initialized target structure to copy data to</param>
/// <exception cref="ArgumentNullException"></exception>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public static void CopyStruct<T>(ReadOnlySpan<byte> sourceData, T* target) where T : unmanaged => CopyStruct(sourceData, ref *target);
+ public static void CopyStruct<T>(ReadOnlySpan<byte> sourceData, T* target) where T : unmanaged
+ => CopyStruct(sourceData, ref *target);
/// <summary>
/// Copies structure data from a source sequence of data to the target structure reference.
@@ -558,7 +560,8 @@ namespace VNLib.Utils.Memory
/// <param name="target">A pointer to initialized target structure to copy data to</param>
/// <exception cref="ArgumentNullException"></exception>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public static void CopyStruct<T>(ReadOnlySpan<byte> sourceData, void* target) where T: unmanaged => CopyStruct(sourceData, (T*)target);
+ public static void CopyStruct<T>(ReadOnlySpan<byte> sourceData, void* target) where T: unmanaged
+ => CopyStruct(sourceData, (T*)target);
/// <summary>
@@ -743,7 +746,7 @@ namespace VNLib.Utils.Memory
ref Refs.AsByte(source, (nuint)sourceOffset),
ref Refs.AsByte(dest, destOffset),
ByteCount<T>((uint)count),
- false
+ forceAcceleration: false
);
}
@@ -774,7 +777,7 @@ namespace VNLib.Utils.Memory
RMemCopyHandle<T> src = new(source, (nuint)sourceOffset);
MemhandleCopyHandle<T> dst = new(dest, destOffset);
- MemmoveInternal<T, RMemCopyHandle<T>, MemhandleCopyHandle<T>>(in src, in dst, (nuint)count, false);
+ MemmoveInternal<T, RMemCopyHandle<T>, MemhandleCopyHandle<T>>(in src, in dst, (nuint)count, forceAcceleration: false);
}
/// <summary>
@@ -809,7 +812,7 @@ namespace VNLib.Utils.Memory
ref Refs.AsByte(source, (nuint)sourceOffset),
ref Refs.AsByte(dest, (nuint)destOffset),
ByteCount<T>((uint)count),
- false
+ forceAcceleration: false
);
}
@@ -842,7 +845,7 @@ namespace VNLib.Utils.Memory
MemhandleCopyHandle<T> src = new(source, (nuint)sourceOffset);
WMemCopyHandle<T> dst = new(dest, (nuint)destOffset);
- MemmoveInternal<T, MemhandleCopyHandle<T>, WMemCopyHandle<T>>(in src, in dst, (nuint)count, false);
+ MemmoveInternal<T, MemhandleCopyHandle<T>, WMemCopyHandle<T>>(in src, in dst, (nuint)count, forceAcceleration: false);
}
/// <summary>
@@ -872,7 +875,7 @@ namespace VNLib.Utils.Memory
MemhandleCopyHandle<T> src = new(source, sourceOffset);
MemhandleCopyHandle<T> dst = new(dest, destOffset);
- MemmoveInternal<T, MemhandleCopyHandle<T>, MemhandleCopyHandle<T>>(in src, in dst, count, false);
+ MemmoveInternal<T, MemhandleCopyHandle<T>, MemhandleCopyHandle<T>>(in src, in dst, count, forceAcceleration: false);
}
/// <summary>
@@ -901,7 +904,7 @@ namespace VNLib.Utils.Memory
MemhandleCopyHandle<T> src = new(source, sourceOffset);
ArrayCopyHandle<T> dst = new(dest, destOffset);
- MemmoveInternal<T, MemhandleCopyHandle<T>, ArrayCopyHandle<T>>(in src, in dst, count, false);
+ MemmoveInternal<T, MemhandleCopyHandle<T>, ArrayCopyHandle<T>>(in src, in dst, count, forceAcceleration: false);
}
/// <summary>
@@ -930,7 +933,7 @@ namespace VNLib.Utils.Memory
ArrayCopyHandle<T> ach = new(source, sourceOffset);
MemhandleCopyHandle<T> mch = new(dest, destOffset);
- MemmoveInternal<T, ArrayCopyHandle<T>, MemhandleCopyHandle<T>>(in ach, in mch, count, false);
+ MemmoveInternal<T, ArrayCopyHandle<T>, MemhandleCopyHandle<T>>(in ach, in mch, count, forceAcceleration: false);
}
/// <summary>
@@ -959,7 +962,7 @@ namespace VNLib.Utils.Memory
ArrayCopyHandle<T> srcH = new(source, sourceOffset);
ArrayCopyHandle<T> dstH = new(dest, destOffset);
- MemmoveInternal<T, ArrayCopyHandle<T>, ArrayCopyHandle<T>>(in srcH, in dstH, count, false);
+ MemmoveInternal<T, ArrayCopyHandle<T>, ArrayCopyHandle<T>>(in srcH, in dstH, count, forceAcceleration: false);
}
/// <summary>
@@ -1029,7 +1032,7 @@ namespace VNLib.Utils.Memory
in Refs.AsByteR(in src, srcOffset),
ref Refs.AsByte(ref dst, dstOffset),
ByteCount<T>(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);
@@ -1587,9 +1588,6 @@ namespace VNLib.Utils.Memory
public readonly nuint Offset => offset;
///<inheritdoc/>
- public readonly nuint Size => ByteCount<T>((nuint)array.Length);
-
- ///<inheritdoc/>
public readonly MemoryHandle Pin() => PinArrayAndGetHandle(array, 0);
///<inheritdoc/>
@@ -1605,9 +1603,6 @@ namespace VNLib.Utils.Memory
public readonly nuint Offset => offset;
///<inheritdoc/>
- public readonly nuint Size => ByteCount<T>((nuint)block.Length);
-
- ///<inheritdoc/>
public readonly MemoryHandle Pin() => block.Pin();
///<inheritdoc/>
@@ -1623,9 +1618,6 @@ namespace VNLib.Utils.Memory
public readonly nuint Offset => offset;
///<inheritdoc/>
- public readonly nuint Size => ByteCount<T>((nuint)block.Length);
-
- ///<inheritdoc/>
public readonly MemoryHandle Pin() => block.Pin();
///<inheritdoc/>
@@ -1641,9 +1633,6 @@ namespace VNLib.Utils.Memory
public readonly nuint Offset => offset;
///<inheritdoc/>
- public readonly nuint Size => handle.Length;
-
- ///<inheritdoc/>
public readonly MemoryHandle Pin() => handle.Pin(0);
///<inheritdoc/>
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
/// <param name="left"></param>
/// <param name="right"></param>
/// <returns>True if handles are equal, flase otherwise</returns>
- public static bool operator ==(in UnsafeMemoryHandle<T> left, in UnsafeMemoryHandle<T> right) => left.Equals(right);
+ public static bool operator ==(in UnsafeMemoryHandle<T> left, in UnsafeMemoryHandle<T> right) => left.Equals(in right);
/// <summary>
/// Equality overload
@@ -294,7 +294,7 @@ namespace VNLib.Utils.Memory
/// <param name="left"></param>
/// <param name="right"></param>
/// <returns>True if handles are equal, flase otherwise</returns>
- public static bool operator !=(in UnsafeMemoryHandle<T> left, in UnsafeMemoryHandle<T> right) => !left.Equals(right);
+ public static bool operator !=(in UnsafeMemoryHandle<T> left, in UnsafeMemoryHandle<T> right) => !left.Equals(in right);
}
}