Merge pull request #18 from dotnet-campus/t/lindexi/WalhayqeelereWenewhearca

提供释放的方法

Author: walterlv

.github/workflows/dotnetcore.yml

@@ -12,3 +12,5 @@ jobs:
 
     - name: Build with dotnet
       run: dotnet build --configuration Release
+    - name: Test with dotnet
+      run: dotnet test --configuration Release

AsyncWorkerCollection.sln

@@ -1,9 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26124.0
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30413.136
 MinimumVisualStudioVersion = 15.0.26124.0
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsyncWorkerCollection", "AsyncWorkerCollection\AsyncWorkerCollection.csproj", "{8A479E25-0FE9-4A67-9AED-8B7E0A46C62D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AsyncWorkerCollection", "AsyncWorkerCollection\AsyncWorkerCollection.csproj", "{8A479E25-0FE9-4A67-9AED-8B7E0A46C62D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsyncWorkerCollection.Tests", "test\AsyncWorkerCollection.Tests\AsyncWorkerCollection.Tests.csproj", "{70F29F77-FE49-45FE-9FED-7162897CB7B2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -14,9 +16,6 @@ Global
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{8A479E25-0FE9-4A67-9AED-8B7E0A46C62D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8A479E25-0FE9-4A67-9AED-8B7E0A46C62D}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -30,5 +29,23 @@ Global
 		{8A479E25-0FE9-4A67-9AED-8B7E0A46C62D}.Release|x64.Build.0 = Release|Any CPU
 		{8A479E25-0FE9-4A67-9AED-8B7E0A46C62D}.Release|x86.ActiveCfg = Release|Any CPU
 		{8A479E25-0FE9-4A67-9AED-8B7E0A46C62D}.Release|x86.Build.0 = Release|Any CPU
+		{70F29F77-FE49-45FE-9FED-7162897CB7B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{70F29F77-FE49-45FE-9FED-7162897CB7B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{70F29F77-FE49-45FE-9FED-7162897CB7B2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{70F29F77-FE49-45FE-9FED-7162897CB7B2}.Debug|x64.Build.0 = Debug|Any CPU
+		{70F29F77-FE49-45FE-9FED-7162897CB7B2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{70F29F77-FE49-45FE-9FED-7162897CB7B2}.Debug|x86.Build.0 = Debug|Any CPU
+		{70F29F77-FE49-45FE-9FED-7162897CB7B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{70F29F77-FE49-45FE-9FED-7162897CB7B2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{70F29F77-FE49-45FE-9FED-7162897CB7B2}.Release|x64.ActiveCfg = Release|Any CPU
+		{70F29F77-FE49-45FE-9FED-7162897CB7B2}.Release|x64.Build.0 = Release|Any CPU
+		{70F29F77-FE49-45FE-9FED-7162897CB7B2}.Release|x86.ActiveCfg = Release|Any CPU
+		{70F29F77-FE49-45FE-9FED-7162897CB7B2}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {AB058385-F511-4985-B3F0-B5862FB893AA}
 	EndGlobalSection
 EndGlobal

AsyncWorkerCollection/AsyncAutoResetEvent.cs

@@ -1,5 +1,5 @@
-using System.Collections.Generic;
-using System.Linq;
+using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace dotnetCampus.Threading
@@ -8,7 +8,7 @@ namespace dotnetCampus.Threading
     /// 异步等待的autoresetevent
     /// WaitOneAsync方法会返回一个task，通过await方式等待
     /// </summary>
-    public class AsyncAutoResetEvent
+    public class AsyncAutoResetEvent : IDisposable
     {
         /// <summary>
         /// 提供一个信号初始值，确定是否有信号
@@ -19,22 +19,31 @@ public AsyncAutoResetEvent(bool initialState)
             _isSignaled = initialState;
         }
 
-        private static readonly Task CompletedSourceTask
-#if NETFRAMEWORK
-            = Task.FromResult(true);
-#else
-            = Task.CompletedTask;
-#endif
+        ~AsyncAutoResetEvent()
+        {
+            Dispose();
+        }
 
+        private static readonly Task<bool> CompletedSourceTask
+            = Task.FromResult(true);
 
         /// <summary>
-        /// 异步等待一个信号，需要await
+        /// 异步等待一个信号，需要 await 等待
+        /// <para></para>
+        /// 可以通过返回值是 true 或 false 判断当前是收到信号还是此类被释放
         /// </summary>
-        /// <returns></returns>
-        public Task WaitOneAsync()
+        /// <returns>
+        /// 如果是正常解锁，那么返回 true 值。如果是对象调用 <see cref="Dispose"/> 释放，那么返回 false 值
+        /// </returns>
+        public Task<bool> WaitOneAsync()
         {
             lock (_locker)
             {
+                if (_isDisposed)
+                {
+                    throw new ObjectDisposedException(nameof(AsyncAutoResetEvent));
+                }
+
                 if (_isSignaled)
                 {
                     // 按照 AutoResetEvent 的设计，在没有任何等待进入时，如果有设置 Set 方法，那么下一次第一个进入的等待将会通过
@@ -55,9 +64,10 @@ public Task WaitOneAsync()
         public void Set()
         {
             TaskCompletionSource<bool> releaseSource = null;
+            bool result;
             lock (_locker)
             {
-                if (_waitQueue.Any())
+                if (_waitQueue.Count > 0)
                 {
                     releaseSource = _waitQueue.Dequeue();
                 }
@@ -69,11 +79,43 @@ public void Set()
                         _isSignaled = true;
                     }
                 }
+
+                // 如果这个类被释放了，那么返回 false 值
+                result = !_isDisposed;
+            }
+
+            releaseSource?.SetResult(result);
+        }
+
+        /// <summary>
+        /// 非线程安全 调用时将会释放所有等待 <see cref="WaitOneAsync"/> 方法
+        /// </summary>
+        public void Dispose()
+        {
+            lock (_locker)
+            {
+                _isDisposed = true;
             }
 
-            releaseSource?.SetResult(true);
+            GC.SuppressFinalize(this);
+
+            while (true)
+            {
+                lock (_locker)
+                {
+                    if (_waitQueue.Count == 0)
+                    {
+                        return;
+                    }
+                }
+
+                // 修复 https://github.com/dotnet-campus/AsyncWorkerCollection/issues/16
+                Set();
+            }
         }
 
+        private bool _isDisposed;
+
         private readonly object _locker = new object();
 
         private readonly Queue<TaskCompletionSource<bool>> _waitQueue =