Trang chủ Khám phá Trợ giúp
Đăng nhập
dotnet
/
aspnetcore
mirror of https://github.com/dotnet/aspnetcore.git
2
0
Fork 0
Các tập tin Các vấn đề 0 Wiki
Browse Source

Improve MultipartReader performance (#51426)

Brennan 2 năm trước cách đây
mục cha
29e0b6b0be
commit
742cbd9bbf
4 tập tin đã thay đổi với 201 bổ sung và 21 xóa
View chưa được định nghĩa Hiển thị tình trạng sai khác
  1. 0 1
      src/Http/WebUtilities/perf/Microbenchmarks/Microsoft.AspNetCore.WebUtilities.Microbenchmarks.csproj
  2. 163 0
      src/Http/WebUtilities/perf/Microbenchmarks/MultipartReaderBenchmark.cs
  3. 23 20
      src/Http/WebUtilities/src/BufferedReadStream.cs
  4. 15 0
      src/Http/WebUtilities/src/MultipartReaderStream.cs

+ 0 - 1
src/Http/WebUtilities/perf/Microbenchmarks/Microsoft.AspNetCore.WebUtilities.Microbenchmarks.csproj
Xem Tập Tin 

@@ -8,7 +8,6 @@
 
     <RootNamespace>Microsoft.AspNetCore.WebUtilities</RootNamespace>
 
     <RootNamespace>Microsoft.AspNetCore.WebUtilities</RootNamespace>
 
   </PropertyGroup>
 
   </PropertyGroup>
 
 
 
-
 
   <ItemGroup>
 
   <ItemGroup>
 
     <Reference Include="BenchmarkDotNet" />
 
     <Reference Include="BenchmarkDotNet" />
 
     <Reference Include="Microsoft.AspNetCore.WebUtilities" />
 
     <Reference Include="Microsoft.AspNetCore.WebUtilities" />

+ 163 - 0
src/Http/WebUtilities/perf/Microbenchmarks/MultipartReaderBenchmark.cs
Xem Tập Tin 

@@ -0,0 +1,163 @@
 
+// Licensed to the .NET Foundation under one or more agreements.
 
+// The .NET Foundation licenses this file to you under the MIT license.
 
+
 
+using System.Globalization;
 
+using System.Text;
 
+using BenchmarkDotNet.Attributes;
 
+using BenchmarkDotNet.Order;
 
+using static System.Net.Mime.MediaTypeNames;
 
+
 
+namespace Microsoft.AspNetCore.WebUtilities.Microbenchmarks;
 
+
 
+public class MultipartReaderBenchmark
 
+{
 
+    MemoryStream _stream;
 
+
 
+    [Params(6, 28, 70)]
 
+    public int BoundarySize { get; set; }
 
+
 
+    [Params(1, 2, 3)]
 
+    public int SectionCount { get; set; }
 
+
 
+    [Params(true, false)]
 
+    public bool LargePayload { get; set; }
 
+
 
+    private string Boundary { get; set; }
 
+
 
+    [GlobalSetup]
 
+    public void Setup()
 
+    {
 
+        string data;
 
+        switch (BoundarySize)
 
+        {
 
+            case 6:
 
+                Boundary = "abc123";
 
+                break;
 
+            case 28:
 
+                Boundary = "9051914041544843365972754266";
 
+                break;
 
+            case 70:
 
+                Boundary = "WbQvpJcaxJRjMqwLdioBSOyJk3fHYdo9hLCOSBkHYW70pU71tH3lJq6ZUcSErOl0NRn5uT";
 
+                break;
 
+            default:
 
+                throw new InvalidOperationException(nameof(BoundarySize));
 
+        }
 
+
 
+        switch (SectionCount)
 
+        {
 
+            case 1:
 
+                data = $"--{Boundary}\r\n" +
 
+"Content-Disposition: form-data; name=\"text\"\r\n" +
 
+"\r\n" +
 
+$"text default{new string('a', LargePayload ? 10000000 : 0)}\r\n" +
 
+$"--{Boundary}--\r\n"; ;
 
+                break;
 
+            case 2:
 
+                data = $"--{Boundary}\r\n" +
 
+"Content-Disposition: form-data; name=\"text\"\r\n" +
 
+"\r\n" +
 
+"text default\r\n" +
 
+$"--{Boundary}\r\n" +
 
+"Content-Disposition: form-data; name=\"file1\"; filename=\"a.txt\"\r\n" +
 
+"Content-Type: text/plain\r\n" +
 
+"\r\n" +
 
+$"Content of a.txt.{new string('a', LargePayload ? 10000000 : 0)}\r\n" +
 
+"\r\n" +
 
+$"--{Boundary}--\r\n";
 
+                break;
 
+            case 3:
 
+                data = $"--{Boundary}\r\n" +
 
+"Content-Disposition: form-data; name=\"text\"\r\n" +
 
+"\r\n" +
 
+"text default\r\n" +
 
+$"--{Boundary}\r\n" +
 
+"Content-Disposition: form-data; name=\"file1\"; filename=\"a.txt\"\r\n" +
 
+"Content-Type: text/plain\r\n" +
 
+"\r\n" +
 
+$"Content of a.txt{new string('a', LargePayload ? 10000000 : 0)}\r\n" +
 
+"\r\n" +
 
+$"--{Boundary}\r\n" +
 
+"Content-Disposition: form-data; name=\"file2\"; filename=\"a.html\"\r\n" +
 
+"Content-Type: text/html\r\n" +
 
+"\r\n" +
 
+"<!DOCTYPE html><title>Content of a.html.</title>\r\n" +
 
+"\r\n" +
 
+$"--{Boundary}--\r\n";
 
+                break;
 
+            default:
 
+                throw new ArgumentOutOfRangeException(nameof(SectionCount));
 
+        }
 
+        _stream = new MemoryStream(Encoding.UTF8.GetBytes(data));
 
+    }
 
+
 
+    [Benchmark]
 
+    public async Task MultipartReaderParsing()
 
+    {
 
+        var reader = new MultipartReader(Boundary, _stream);
 
+
 
+        var sectionCount = 0;
 
+        MultipartSection section;
 
+        do
 
+        {
 
+            section = await reader.ReadNextSectionAsync();
 
+            sectionCount += section is not null ? 1 : 0;
 
+        }
 
+        while (section is not null);
 
+
 
+        _stream.Position = 0;
 
+
 
+        if (sectionCount != SectionCount)
 
+        {
 
+            throw new InvalidOperationException();
 
+        }
 
+    }
 
+
 
+    [Benchmark]
 
+    public async Task MultipartReaderParsingWithRead()
 
+    {
 
+        var reader = new MultipartReader(Boundary, _stream);
 
+
 
+        var sectionCount = 0;
 
+        MultipartSection section;
 
+        do
 
+        {
 
+            section = await reader.ReadNextSectionAsync();
 
+            sectionCount += section is not null ? 1 : 0;
 
+
 
+            section?.Body.CopyTo(NullStream.Instance);
 
+        }
 
+        while (section is not null);
 
+
 
+        _stream.Position = 0;
 
+
 
+        if (sectionCount != SectionCount)
 
+        {
 
+            throw new InvalidOperationException();
 
+        }
 
+    }
 
+
 
+    public class NullStream : Stream
 
+    {
 
+        public static readonly NullStream Instance = new NullStream();
 
+
 
+        public override bool CanRead => true;
 
+
 
+        public override bool CanSeek => true;
 
+
 
+        public override bool CanWrite => true;
 
+
 
+        public override long Length => 0;
 
+
 
+        public override long Position { get => 0; set { } }
 
+
 
+        public override void Flush() { }
 
+
 
+        public override int Read(byte[] buffer, int offset, int count) => 0;
 
+
 
+        public override long Seek(long offset, SeekOrigin origin) => 0;
 
+
 
+        public override void SetLength(long value) { }
 
+
 
+        public override void Write(byte[] buffer, int offset, int count) { }
 
+    }
 
+}

+ 23 - 20
src/Http/WebUtilities/src/BufferedReadStream.cs
Xem Tập Tin 

@@ -352,11 +352,7 @@ public class BufferedReadStream : Stream
 
 
 
             while (!foundCRLF && EnsureBuffered())
 
             while (!foundCRLF && EnsureBuffered())
 
             {
 
             {
 
-                if (builder.Length > lengthLimit)
 
-                {
 
-                    throw new InvalidDataException($"Line length limit {lengthLimit} exceeded.");
 
-                }
 
-                ProcessLineChar(builder, ref foundCR, ref foundCRLF);
 
+                ProcessLineChar(builder, lengthLimit, ref foundCR, ref foundCRLF);
 
             }
 
             }
 
 
 
             return DecodeLine(builder, foundCRLF);
 
             return DecodeLine(builder, foundCRLF);
 
@@ -380,30 +376,37 @@ public class BufferedReadStream : Stream
 
 
 
             while (!foundCRLF && await EnsureBufferedAsync(cancellationToken))
 
             while (!foundCRLF && await EnsureBufferedAsync(cancellationToken))
 
             {
 
             {
 
-                if (builder.Length > lengthLimit)
 
-                {
 
-                    throw new InvalidDataException($"Line length limit {lengthLimit} exceeded.");
 
-                }
 
-
 
-                ProcessLineChar(builder, ref foundCR, ref foundCRLF);
 
+                ProcessLineChar(builder, lengthLimit, ref foundCR, ref foundCRLF);
 
             }
 
             }
 
 
 
             return DecodeLine(builder, foundCRLF);
 
             return DecodeLine(builder, foundCRLF);
 
         }
 
         }
 
     }
 
     }
 
 
 
-    private void ProcessLineChar(MemoryStream builder, ref bool foundCR, ref bool foundCRLF)
 
+    private void ProcessLineChar(MemoryStream builder, int lengthLimit,  ref bool foundCR, ref bool foundCRLF)
 
     {
 
     {
 
-        var b = _buffer[_bufferOffset];
 
-        builder.WriteByte(b);
 
-        _bufferOffset++;
 
-        _bufferCount--;
 
-        if (b == LF && foundCR)
 
+        var writeCount = 0;
 
+        while (_bufferCount > 0)
 
         {
 
         {
 
-            foundCRLF = true;
 
-            return;
 
+            var b = _buffer[_bufferOffset];
 
+            _bufferOffset++;
 
+            _bufferCount--;
 
+            writeCount++;
 
+            if (b == LF && foundCR)
 
+            {
 
+                builder.Write(_buffer.AsSpan(_bufferOffset - writeCount, writeCount));
 
+                foundCRLF = true;
 
+                return;
 
+            }
 
+            foundCR = b == CR;
 
+
 
+            if (writeCount > lengthLimit)
 
+            {
 
+                throw new InvalidDataException($"Line length limit {lengthLimit} exceeded.");
 
+            }
 
         }
 
         }
 
-        foundCR = b == CR;
 
+
 
+        builder.Write(_buffer.AsSpan(_bufferOffset - writeCount, writeCount));
 
     }
 
     }
 
 
 
     private static string DecodeLine(MemoryStream builder, bool foundCRLF)
 
     private static string DecodeLine(MemoryStream builder, bool foundCRLF)

+ 15 - 0
src/Http/WebUtilities/src/MultipartReaderStream.cs
Xem Tập Tin 

@@ -329,4 +329,19 @@ internal sealed class MultipartReaderStream : Stream
 
         }
 
         }
 
         return 0;
 
         return 0;
 
     }
 
     }
 
+
 
+    public override void CopyTo(Stream destination, int bufferSize)
 
+    {
 
+        bufferSize = Math.Max(4096, bufferSize);
 
+        base.CopyTo(destination, bufferSize);
 
+    }
 
+
 
+    public override Task CopyToAsync(Stream destination, int bufferSize, CancellationToken cancellationToken)
 
+    {
 
+        // Set a minimum buffer size of 4K since the base Stream implementation has weird behavior when the stream is
 
+        // seekable *and* the length is 0 (it passes in a buffer size of 1).
 
+        // See https://github.com/dotnet/runtime/blob/222415c56c9ea73530444768c0e68413eb374f5d/src/libraries/System.Private.CoreLib/src/System/IO/Stream.cs#L164-L184
 
+        bufferSize = Math.Max(4096, bufferSize);
 
+        return base.CopyToAsync(destination, bufferSize, cancellationToken);
 
+    }
 
 }
 
 }