[IO] fixed occasional exception in ReadArray observed on net 8.0 runtime

aardvark-platform · May 8, 2024 · c3e7825 · c3e7825
1 parent 1ee5e5f
commit c3e7825
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/Aardvark.Base.IO/Aardvark.Base.IO.csproj b/src/Aardvark.Base.IO/Aardvark.Base.IO.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <NoWarn>612;1591</NoWarn>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

diff --git a/src/Aardvark.Base.IO/StreamCodeReader.cs b/src/Aardvark.Base.IO/StreamCodeReader.cs
@@ -123,6 +123,25 @@ public long ReadArray<T>(T[] array, long index, long count)
             where T : struct
         {
             if (count < 1) return 0;
+
+#if NET6_0_OR_GREATER
+            var span = MemoryMarshal.AsBytes(array.AsSpan((int)index, (int)count));
+
+            var sizeOfT = span.Length / array.Length;
+            var bytesToRead = span.Length;
+            var offset = 0;
+
+            do
+            {
+                int finished = base.Read(span);
+                if (finished == 0) break;
+                offset += finished; bytesToRead -= finished;
+                span = span.Slice(offset, bytesToRead);
+            }
+            while (bytesToRead > 0);
+
+            return offset / sizeOfT;
+#else
             unsafe
             {
                 var sizeOfT = Marshal.SizeOf(typeof(T));
@@ -152,6 +171,7 @@ public long ReadArray<T>(T[] array, long index, long count)
                 }
                 return ((long)(offset / sizeOfT) - index);
             }
+#endif
         }
 
         public long ReadArray<T>(T[,] array, long count)