Merge pull request #266 from OronDF343/add-memorystream-copytoasync

Asynchronous implementation of `MemorySource<TSource>.CopyToAsync`
CommunityToolkit · Jul 6, 2022 · 8528092 · 8528092
2 parents 43bafc5 + 76e1900
commit 8528092
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 2 deletions.
diff --git a/CommunityToolkit.HighPerformance/Streams/MemoryStream{TSource}.cs b/CommunityToolkit.HighPerformance/Streams/MemoryStream{TSource}.cs
@@ -119,9 +119,13 @@ public sealed override Task CopyToAsync(Stream destination, int bufferSize, Canc
 
         try
         {
-            CopyTo(destination, bufferSize);
+            MemoryStream.ValidateDisposed(this.disposed);
 
-            return Task.CompletedTask;
+            Memory<byte> source = this.source.Memory.Slice(this.position);
+
+            this.position += source.Length;
+
+            return destination.WriteAsync(source, cancellationToken).AsTask();
         }
         catch (OperationCanceledException e)
         {

diff --git a/CommunityToolkit.HighPerformance/Streams/Sources/ArrayOwner.cs b/CommunityToolkit.HighPerformance/Streams/Sources/ArrayOwner.cs
@@ -74,4 +74,11 @@ public Span<byte> Span
 #endif
         }
     }
+
+    /// <inheritdoc/>
+    public Memory<byte> Memory
+    {
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        get => this.array.AsMemory(this.offset, this.length);
+    }
 }
diff --git a/CommunityToolkit.HighPerformance/Streams/Sources/Interfaces/ISpanOwner.cs b/CommunityToolkit.HighPerformance/Streams/Sources/Interfaces/ISpanOwner.cs
@@ -20,4 +20,9 @@ internal interface ISpanOwner
     /// Gets a <see cref="Span{T}"/> instance wrapping the underlying memory area.
     /// </summary>
     Span<byte> Span { get; }
+
+    /// <summary>
+    /// Gets a <see cref="Memory{T}"/> instance wrapping the underlying memory area.
+    /// </summary>
+    Memory<byte> Memory { get; }
 }
diff --git a/CommunityToolkit.HighPerformance/Streams/Sources/MemoryManagerOwner.cs b/CommunityToolkit.HighPerformance/Streams/Sources/MemoryManagerOwner.cs
@@ -61,4 +61,11 @@ public Span<byte> Span
             return this.memoryManager.GetSpan().Slice(this.offset, this.length);
         }
     }
+
+    /// <inheritdoc/>
+    public Memory<byte> Memory
+    {
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        get => this.memoryManager.Memory.Slice(this.offset, this.length);
+    }
 }
diff --git a/tests/CommunityToolkit.HighPerformance.UnitTests/Streams/Test_MemoryStream.cs b/tests/CommunityToolkit.HighPerformance.UnitTests/Streams/Test_MemoryStream.cs
@@ -252,6 +252,66 @@ public async Task Test_MemoryStream_ReadWriteAsync_Memory()
         Assert.IsTrue(data.Span.SequenceEqual(result.Span));
     }
 
+    [TestMethod]
+    public void Test_MemoryStream_CopyTo()
+    {
+        Stream source = new byte[100].AsMemory().AsStream();
+
+        Memory<byte> data = CreateRandomData(64);
+
+        source.Write(data.Span);
+
+        Assert.AreEqual(source.Position, data.Length);
+
+        source.Position = 0;
+
+        Stream destination = new byte[100].AsMemory().AsStream();
+
+        source.CopyTo(destination);
+
+        Assert.AreEqual(source.Position, destination.Position);
+
+        destination.Position = 0;
+
+        Memory<byte> result = new byte[data.Length];
+
+        int bytesRead = destination.Read(result.Span);
+
+        Assert.AreEqual(bytesRead, result.Length);
+        Assert.AreEqual(destination.Position, data.Length);
+        Assert.IsTrue(data.Span.SequenceEqual(result.Span));
+    }
+
+    [TestMethod]
+    public async Task Test_MemoryStream_CopyToAsync()
+    {
+        Stream source = new byte[100].AsMemory().AsStream();
+
+        Memory<byte> data = CreateRandomData(64);
+
+        await source.WriteAsync(data);
+
+        Assert.AreEqual(source.Position, data.Length);
+
+        source.Position = 0;
+
+        Stream destination = new byte[100].AsMemory().AsStream();
+
+        await source.CopyToAsync(destination);
+
+        Assert.AreEqual(source.Position, destination.Position);
+
+        destination.Position = 0;
+
+        Memory<byte> result = new byte[data.Length];
+
+        int bytesRead = await destination.ReadAsync(result);
+
+        Assert.AreEqual(bytesRead, result.Length);
+        Assert.AreEqual(destination.Position, data.Length);
+        Assert.IsTrue(data.Span.SequenceEqual(result.Span));
+    }
+
     /// <summary>
     /// Creates a random <see cref="byte"/> array filled with random data.
     /// </summary>