选择性使用ConcurrentCache与ConcurrentDictionary

xljiulang · xljiulang · commit 939277f552d9 · 2020-05-25T11:59:16.000+08:00
diff --git a/WebApiClientCore.Benchmarks/ConcurrentCacheBenchmark/Benchmark.cs b/WebApiClientCore.Benchmarks/ConcurrentCacheBenchmark/Benchmark.cs
@@ -0,0 +1,24 @@
+﻿using BenchmarkDotNet.Attributes;
+using System;
+using System.Collections.Concurrent;
+
+namespace WebApiClientCore.Benchmarks.ConcurrentCacheBenchmark
+{
+    public class Benchmark : IBenchmark
+    {
+        private readonly ConcurrentCache<Type, string> cache = new ConcurrentCache<Type, string>();
+        private readonly ConcurrentDictionary<Type, string> dic = new ConcurrentDictionary<Type, string>();
+
+        [Benchmark]
+        public void ConcurrentCache_GetOrAdd()
+        {
+            cache.GetOrAdd(typeof(Benchmark), key => string.Empty);
+        }
+
+        [Benchmark]
+        public void ConcurrentDictionary_GetOrAdd()
+        {
+            dic.GetOrAdd(typeof(Benchmark), key => string.Empty);
+        }
+    }
+}
diff --git a/WebApiClientCore.Benchmarks/Program.cs b/WebApiClientCore.Benchmarks/Program.cs
@@ -8,11 +8,14 @@ class Program
     {
         static void Main(string[] args)
         {
-            var benchmarkTypes = typeof(Program).Assembly.GetTypes().Where(item => typeof(IBenchmark).IsAssignableFrom(item));
-            foreach(var item in benchmarkTypes)
+            var benchmarkTypes = typeof(Program).Assembly.GetTypes()
+                .Where(item => typeof(IBenchmark).IsAssignableFrom(item))
+                .Where(item => item.IsAbstract == false && item.IsClass);
+
+            foreach (var item in benchmarkTypes)
             {
                 BenchmarkRunner.Run(item);
-            } 
+            }
             Console.ReadLine();
         }
     }
diff --git a/WebApiClientCore.Benchmarks/RequestBenchmark/Benchmark.cs b/WebApiClientCore.Benchmarks/RequestBenchmark/Benchmark.cs
@@ -1,21 +1,17 @@
-﻿using BenchmarkDotNet.Attributes;
-using Microsoft.Extensions.DependencyInjection;
+﻿using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.Net.Http;
-using System.Text.Json;
 using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace WebApiClientCore.Benchmarks.RequestBenchmark
 {
-    /// <summary> 
-    /// 跳过真实的http请求环节的模拟Get请求
-    /// </summary>
-    public class Benchmark : IBenchmark
+    public abstract class BenChmark : IBenchmark
     {
-        private readonly IServiceProvider serviceProvider;
+        protected IServiceProvider ServiceProvider { get; }
 
-        public Benchmark()
-        { 
+        public BenChmark()
+        {
             var services = new ServiceCollection();
 
             services
@@ -30,97 +26,20 @@ public Benchmark()
                 .AddHttpApi<IWebApiClientApi>(services, o => o.HttpHost = new Uri("http://webapiclient.com/"))
                 .AddHttpMessageHandler(() => new MockResponseHandler());
 
-            this.serviceProvider = services.BuildServiceProvider();
-        }
+            this.ServiceProvider = services.BuildServiceProvider();
 
-        /// <summary>
-        /// 使用WebApiClient.JIT请求
-        /// </summary>
-        /// <returns></returns>
-        [Benchmark]
-        public async Task<Model> WebApiClient_GetAsync()
-        {
-            using var scope = this.serviceProvider.CreateScope();
-            var banchmarkApi = scope.ServiceProvider.GetRequiredService<IWebApiClientApi>();
-            return await banchmarkApi.GetAsyc(id: "id");
+            this.PreheatAsync().Wait();
         }
 
-        /// <summary>
-        /// 使用WebApiClientCore请求
-        /// </summary>
-        /// <returns></returns>
-        [Benchmark]
-        public async Task<Model> WebApiClientCore_GetAsync()
+        private async Task PreheatAsync()
         {
-            using var scope = this.serviceProvider.CreateScope();
-            var banchmarkApi = scope.ServiceProvider.GetRequiredService<IWebApiClientCoreApi>();
-            return await banchmarkApi.GetAsyc(id: "id");
-        }
-
-        /// <summary>
-        /// 使用原生HttpClient请求
-        /// </summary>
-        /// <returns></returns>
-        [Benchmark]
-        public async Task<Model> HttpClient_GetAsync()
-        {
-            using var scope = this.serviceProvider.CreateScope();
-            var httpClient = scope.ServiceProvider.GetRequiredService<IHttpClientFactory>().CreateClient(typeof(HttpClient).FullName);
-
-            var id = "id";
-            var request = new HttpRequestMessage(HttpMethod.Get, $"http://webapiclient.com/{id}");
-            var response = await httpClient.SendAsync(request);
-            var json = await response.Content.ReadAsByteArrayAsync();
-            return JsonSerializer.Deserialize<Model>(json);
-        }
-
-
-        /// <summary>
-        /// 使用WebApiClient.JIT请求
-        /// </summary>
-        /// <returns></returns>
-        [Benchmark]
-        public async Task<Model> WebApiClient_PostAsync()
-        {
-            using var scope = this.serviceProvider.CreateScope();
-            var banchmarkApi = scope.ServiceProvider.GetRequiredService<IWebApiClientApi>();
-            var input = new Model { A = "a" };
-            return await banchmarkApi.PostAsync(input);
-        }
-
-        /// <summary>
-        /// 使用WebApiClientCore请求
-        /// </summary>
-        /// <returns></returns>
-        [Benchmark]
-        public async Task<Model> WebApiClientCore_PostAsync()
-        {
-            using var scope = this.serviceProvider.CreateScope();
-            var banchmarkApi = scope.ServiceProvider.GetRequiredService<IWebApiClientCoreApi>();
-            var input = new Model { A = "a" };
-            return await banchmarkApi.PostAsync(input);
-        }
-
-        /// <summary>
-        /// 使用原生HttpClient请求
-        /// </summary>
-        /// <returns></returns>
-        [Benchmark]
-        public async Task<Model> HttpClient_PostAsync()
-        {
-            using var scope = this.serviceProvider.CreateScope();
-            var httpClient = scope.ServiceProvider.GetRequiredService<IHttpClientFactory>().CreateClient(typeof(HttpClient).FullName);
-
-            var input = new Model { A = "a" };
-            var json = JsonSerializer.SerializeToUtf8Bytes(input);
-            var request = new HttpRequestMessage(HttpMethod.Post, $"http://webapiclient.com/")
-            {
-                Content = new JsonContent(json)
-            };
-
-            var response = await httpClient.SendAsync(request);
-            json = await response.Content.ReadAsByteArrayAsync();
-            return JsonSerializer.Deserialize<Model>(json);
+            using var scope = this.ServiceProvider.CreateScope();
+            var api = scope.ServiceProvider.GetService<IWebApiClientApi>();
+            var coreApi = scope.ServiceProvider.GetService<IWebApiClientCoreApi>();
+            await api.GetAsyc("id");
+            await coreApi.GetAsyc("id");
+            await api.PostAsync(new Model { });
+            await coreApi.PostAsync(new Model { });
         }
     }
 }
diff --git a/WebApiClientCore.Benchmarks/RequestBenchmark/GetBenchmark.cs b/WebApiClientCore.Benchmarks/RequestBenchmark/GetBenchmark.cs
@@ -0,0 +1,55 @@
+﻿using BenchmarkDotNet.Attributes;
+using Microsoft.Extensions.DependencyInjection;
+using System.Net.Http;
+using System.Text.Json;
+using System.Threading.Tasks;
+
+namespace WebApiClientCore.Benchmarks.RequestBenchmark
+{
+    /// <summary> 
+    /// 跳过真实的http请求环节的模拟Get请求
+    /// </summary>
+    public class GetBenchmark : BenChmark
+    {
+        /// <summary>
+        /// 使用WebApiClient.JIT请求
+        /// </summary>
+        /// <returns></returns>
+        [Benchmark]
+        public async Task<Model> WebApiClient_GetAsync()
+        {
+            using var scope = this.ServiceProvider.CreateScope();
+            var banchmarkApi = scope.ServiceProvider.GetRequiredService<IWebApiClientApi>();
+            return await banchmarkApi.GetAsyc(id: "id");
+        }
+
+        /// <summary>
+        /// 使用WebApiClientCore请求
+        /// </summary>
+        /// <returns></returns>
+        [Benchmark]
+        public async Task<Model> WebApiClientCore_GetAsync()
+        {
+            using var scope = this.ServiceProvider.CreateScope();
+            var banchmarkApi = scope.ServiceProvider.GetRequiredService<IWebApiClientCoreApi>();
+            return await banchmarkApi.GetAsyc(id: "id");
+        }
+
+        /// <summary>
+        /// 使用原生HttpClient请求
+        /// </summary>
+        /// <returns></returns>
+        [Benchmark]
+        public async Task<Model> HttpClient_GetAsync()
+        {
+            using var scope = this.ServiceProvider.CreateScope();
+            var httpClient = scope.ServiceProvider.GetRequiredService<IHttpClientFactory>().CreateClient(typeof(HttpClient).FullName);
+
+            var id = "id";
+            var request = new HttpRequestMessage(HttpMethod.Get, $"http://webapiclient.com/{id}");
+            var response = await httpClient.SendAsync(request);
+            var json = await response.Content.ReadAsByteArrayAsync();
+            return JsonSerializer.Deserialize<Model>(json);
+        }
+    }
+}
diff --git a/WebApiClientCore.Benchmarks/RequestBenchmark/PostBenchmark.cs b/WebApiClientCore.Benchmarks/RequestBenchmark/PostBenchmark.cs
@@ -0,0 +1,62 @@
+﻿using BenchmarkDotNet.Attributes;
+using Microsoft.Extensions.DependencyInjection;
+using System.Net.Http;
+using System.Text.Json;
+using System.Threading.Tasks;
+
+namespace WebApiClientCore.Benchmarks.RequestBenchmark
+{
+    /// <summary> 
+    /// 跳过真实的http请求环节的模拟Get请求
+    /// </summary>
+    public class PostBenchmark : BenChmark
+    {
+        /// <summary>
+        /// 使用WebApiClient.JIT请求
+        /// </summary>
+        /// <returns></returns>
+        [Benchmark]
+        public async Task<Model> WebApiClient_PostAsync()
+        {
+            using var scope = this.ServiceProvider.CreateScope();
+            var banchmarkApi = scope.ServiceProvider.GetRequiredService<IWebApiClientApi>();
+            var input = new Model { A = "a" };
+            return await banchmarkApi.PostAsync(input);
+        }
+
+        /// <summary>
+        /// 使用WebApiClientCore请求
+        /// </summary>
+        /// <returns></returns>
+        [Benchmark]
+        public async Task<Model> WebApiClientCore_PostAsync()
+        {
+            using var scope = this.ServiceProvider.CreateScope();
+            var banchmarkApi = scope.ServiceProvider.GetRequiredService<IWebApiClientCoreApi>();
+            var input = new Model { A = "a" };
+            return await banchmarkApi.PostAsync(input);
+        }
+
+        /// <summary>
+        /// 使用原生HttpClient请求
+        /// </summary>
+        /// <returns></returns>
+        [Benchmark]
+        public async Task<Model> HttpClient_PostAsync()
+        {
+            using var scope = this.ServiceProvider.CreateScope();
+            var httpClient = scope.ServiceProvider.GetRequiredService<IHttpClientFactory>().CreateClient(typeof(HttpClient).FullName);
+
+            var input = new Model { A = "a" };
+            var json = JsonSerializer.SerializeToUtf8Bytes(input);
+            var request = new HttpRequestMessage(HttpMethod.Post, $"http://webapiclient.com/")
+            {
+                Content = new JsonContent(json)
+            };
+
+            var response = await httpClient.SendAsync(request);
+            json = await response.Content.ReadAsByteArrayAsync();
+            return JsonSerializer.Deserialize<Model>(json);
+        }
+    }
+}
diff --git a/WebApiClientCore/BuildinExtensions/TypeExtensions.cs b/WebApiClientCore/BuildinExtensions/TypeExtensions.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.Collections.Concurrent;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
@@ -15,7 +16,7 @@ static class TypeExtensions
         /// <summary>
         /// 类型的默认值缓存
         /// </summary>
-        private static readonly ConcurrentCache<Type, object?> defaultValueCache = new ConcurrentCache<Type, object?>();
+        private static readonly ConcurrentDictionary<Type, object?> defaultValueCache = new ConcurrentDictionary<Type, object?>();
 
         /// <summary>
         /// 关联的AttributeUsageAttribute是否AllowMultiple
diff --git a/WebApiClientCore/BuildinInterceptor/ActionInterceptor.cs b/WebApiClientCore/BuildinInterceptor/ActionInterceptor.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.Collections.Concurrent;
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 
@@ -12,7 +13,7 @@ class ActionInterceptor : IActionInterceptor
         /// <summary>
         /// action执行器的缓存
         /// </summary>
-        private static readonly ConcurrentCache<Method, IActionInvoker> invokerCache = new ConcurrentCache<Method, IActionInvoker>();
+        private static readonly ConcurrentDictionary<Method, IActionInvoker> invokerCache = new ConcurrentDictionary<Method, IActionInvoker>();
 
         /// <summary>
         /// 服务上下文
diff --git a/WebApiClientCore/BuildinInterceptor/Invokers/DataValidator.cs b/WebApiClientCore/BuildinInterceptor/Invokers/DataValidator.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.Collections.Concurrent;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 
@@ -13,7 +14,7 @@ static class DataValidator
         /// <summary>
         /// 类型的属性否需要验证缓存
         /// </summary>
-        private static readonly ConcurrentCache<Type, bool> cache = new ConcurrentCache<Type, bool>();
+        private static readonly ConcurrentDictionary<Type, bool> cache = new ConcurrentDictionary<Type, bool>();
 
         /// <summary>
         /// 验证参数值输入合法性
diff --git a/WebApiClientCore/Parameters/JsonPatchDocument.cs b/WebApiClientCore/Parameters/JsonPatchDocument.cs
@@ -1,5 +1,6 @@
 ﻿using Microsoft.Extensions.DependencyInjection;
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq.Expressions;
@@ -215,7 +216,7 @@ private class PathVisitor : ExpressionVisitor
             /// <summary>
             /// 属性名称缓存
             /// </summary>
-            private static readonly ConcurrentCache<MemberInfo, string> staticNameCache = new ConcurrentCache<MemberInfo, string>();
+            private static readonly ConcurrentDictionary<MemberInfo, string> staticNameCache = new ConcurrentDictionary<MemberInfo, string>();
 
             /// <summary>
             /// Path访问器

Original file line number	Diff line number	Diff line change
`@@ -8,11 +8,14 @@ class Program`
`8`	`8`	`{`
`9`	`9`	`static void Main(string[] args)`
`10`	`10`	`{`
`11`		`- var benchmarkTypes = typeof(Program).Assembly.GetTypes().Where(item => typeof(IBenchmark).IsAssignableFrom(item));`
`12`		`- foreach(var item in benchmarkTypes)`
	`11`	`+ var benchmarkTypes = typeof(Program).Assembly.GetTypes()`
	`12`	`+ .Where(item => typeof(IBenchmark).IsAssignableFrom(item))`
	`13`	`+ .Where(item => item.IsAbstract == false && item.IsClass);`
	`14`	`+`
	`15`	`+ foreach (var item in benchmarkTypes)`
`13`	`16`	`{`
`14`	`17`	`BenchmarkRunner.Run(item);`
`15`		`- }`
	`18`	`+ }`
`16`	`19`	`Console.ReadLine();`
`17`	`20`	`}`
`18`	`21`	`}`