Merge pull request #119 from SixLabors/js/prove-asynlock-works

JimBobSquarePants · web-flow · commit aa1b1928c675 · 2020-09-05T22:22:32.000+01:00
Add Parallel Identical Query Tests.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -15,6 +15,10 @@ jobs:
         strategy:
             matrix:
                 options:
+                    - os: macos-latest
+                      framework: netcoreapp3.1
+                      runtime: -x64
+                      codecov: false
                     - os: ubuntu-latest
                       framework: netcoreapp3.1
                       runtime: -x64
@@ -45,22 +49,19 @@ jobs:
                   git fetch --prune --unshallow
                   git submodule -q update --init --recursive
 
-            - name: Install Azurite Linux
-              if: matrix.options.os == 'ubuntu-latest'
+            - name: Setup Azurite
+              if: matrix.options.os != 'windows-latest'
               shell: bash
-              run: sudo npm install -g azurite
-
-            - name: Use Azurite Linux
-              if: matrix.options.os == 'ubuntu-latest'
-              shell: bash
-              run: sudo azurite --loose &
+              run: |
+                  sudo npm install -g azurite
+                  sudo azurite --loose &
 
-            - name: Use Azure Storage Emulator Windows
+            - name: Setup Azurite Windows
               if: matrix.options.os == 'windows-latest'
-              shell: cmd
+              shell: bash
               run: |
-                  "%ProgramFiles(x86)%\Microsoft SDKs\Azure\Storage Emulator\AzureStorageEmulator.exe" init /server "(localdb)\MsSqlLocalDb"
-                  "%ProgramFiles(x86)%\Microsoft SDKs\Azure\Storage Emulator\AzureStorageEmulator.exe" start
+                  npm install -g azurite
+                  azurite --loose &
 
             - name: Build
               shell: pwsh
diff --git a/samples/ImageSharp.Web.Sample/wwwroot/index.html b/samples/ImageSharp.Web.Sample/wwwroot/index.html
@@ -1,4 +1,4 @@
-﻿<!DOCTYPE html>
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="utf-8" />
@@ -171,6 +171,35 @@ <h2>Background Color</h2>
                 </p>
             </div>
         </section>
+        <hr />
+        <section>
+            <h2>Identical Queries</h2>
+            <p>Demonstrates that the middleware handles identical queries without file contention.</p>
+            <div>
+                <p>
+                    <code>imagesharp-logo.png?width=123</code>
+                </p>
+                <p>
+                    <img src="imagesharp-logo.png?width=123" />
+                </p>
+            </div>
+            <div>
+                <p>
+                    <code>imagesharp-logo.png?width=123</code>
+                </p>
+                <p>
+                    <img src="imagesharp-logo.png?width=123" />
+                </p>
+            </div>
+            <div>
+                <p>
+                    <code>imagesharp-logo.png?width=123</code>
+                </p>
+                <p>
+                    <img src="imagesharp-logo.png?width=123" />
+                </p>
+            </div>
+        </section>
     </main>
 </body>
-</html>
+</html>
diff --git a/src/ImageSharp.Web/FormatUtilities.cs b/src/ImageSharp.Web/FormatUtilities.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Primitives;
@@ -46,6 +47,7 @@ public FormatUtilities(IOptions<ImageSharpMiddlewareOptions> options)
         /// </summary>
         /// <param name="uri">The full request uri.</param>
         /// <returns>The <see cref="string"/>.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public string GetExtensionFromUri(string uri)
         {
             // TODO: Investigate using span to reduce allocations here.
@@ -81,6 +83,7 @@ public string GetExtensionFromUri(string uri)
         /// </summary>
         /// <param name="contentType">The content type (mime-type).</param>
         /// <returns>The <see cref="string"/>.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public string GetExtensionFromContentType(string contentType) => this.fileExtension[contentType];
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Processing/AzureBlobStorageCacheServerTests.cs b/tests/ImageSharp.Web.Tests/Processing/AzureBlobStorageCacheServerTests.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.IO;
+using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
@@ -16,6 +17,7 @@ public class AzureBlobStorageCacheServerTests : ServerTestBase<AzureBlobStorageC
     {
         private const int Width = 20;
         private static readonly string Command = "?width=" + Width + "&v=" + Guid.NewGuid().ToString();
+        private static readonly string Command2 = "?width=" + (Width + 1) + "&v=" + Guid.NewGuid().ToString();
 
         public AzureBlobStorageCacheServerTests(AzureBlobStorageCacheTestServerFixture fixture)
             : base(fixture)
@@ -25,7 +27,7 @@ public AzureBlobStorageCacheServerTests(AzureBlobStorageCacheTestServerFixture f
         [Theory]
         [InlineData(TestConstants.PhysicalTestImage)]
         [InlineData(TestConstants.AzureTestImage)]
-        public async Task CanProcessAndResolveImage(string url)
+        public async Task CanProcessAndResolveImageAsync(string url)
         {
             string ext = Path.GetExtension(url);
             IImageFormat format = Configuration.Default.ImageFormatsManager.FindFormatByFileExtension(ext);
@@ -97,5 +99,21 @@ public async Task CanProcessAndResolveImage(string url)
             request.Dispose();
             response.Dispose();
         }
+
+        [Theory]
+        [InlineData(TestConstants.PhysicalTestImage)]
+        [InlineData(TestConstants.AzureTestImage)]
+        public async Task CanProcessMultipleIdenticalQueriesAsync(string url)
+        {
+            Task[] tasks = Enumerable.Range(0, 5).Select(_ => Task.Run(async () =>
+            {
+                using HttpResponseMessage response = await this.HttpClient.GetAsync(url + Command2);
+                Assert.NotNull(response);
+            })).ToArray();
+
+            var all = Task.WhenAll(tasks);
+            await all;
+            Assert.True(all.IsCompletedSuccessfully);
+        }
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Processing/PhysicalFileSystemCacheServerTests.cs b/tests/ImageSharp.Web.Tests/Processing/PhysicalFileSystemCacheServerTests.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.IO;
+using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
@@ -16,6 +17,7 @@ public class PhysicalFileSystemCacheServerTests : ServerTestBase<PhysicalFileSys
     {
         private const int Width = 20;
         private static readonly string Command = "?width=" + Width + "&v=" + Guid.NewGuid().ToString();
+        private static readonly string Command2 = "?width=" + (Width + 1) + "&v=" + Guid.NewGuid().ToString();
 
         public PhysicalFileSystemCacheServerTests(PhysicalFileSystemCacheTestServerFixture fixture)
             : base(fixture)
@@ -25,7 +27,7 @@ public PhysicalFileSystemCacheServerTests(PhysicalFileSystemCacheTestServerFixtu
         [Theory]
         [InlineData(TestConstants.PhysicalTestImage)]
         [InlineData(TestConstants.AzureTestImage)]
-        public async Task CanProcessAndResolveImage(string url)
+        public async Task CanProcessAndResolveImageAsync(string url)
         {
             string ext = Path.GetExtension(url);
             IImageFormat format = Configuration.Default.ImageFormatsManager.FindFormatByFileExtension(ext);
@@ -97,5 +99,21 @@ public async Task CanProcessAndResolveImage(string url)
             request.Dispose();
             response.Dispose();
         }
+
+        [Theory]
+        [InlineData(TestConstants.PhysicalTestImage)]
+        [InlineData(TestConstants.AzureTestImage)]
+        public async Task CanProcessMultipleIdenticalQueriesAsync(string url)
+        {
+            Task[] tasks = Enumerable.Range(0, 5).Select(_ => Task.Run(async () =>
+            {
+                using HttpResponseMessage response = await this.HttpClient.GetAsync(url + Command2);
+                Assert.NotNull(response);
+            })).ToArray();
+
+            var all = Task.WhenAll(tasks);
+            await all;
+            Assert.True(all.IsCompletedSuccessfully);
+        }
     }
 }
