implab/ImplabNet Commit - r259:7d52dc684bbd

PollingComponent: implemented correct stopping

cin -

r259:7d52dc684bbd v3

parent child

Context file:

r259:7d52dc684bbd

Collapse all files

Implab.Test/RunnableComponentTests.cs created 644 +42 0

			@@ -0,0 +1,42
		1	using System;
		2	using System.Threading;
		3	using System.Threading.Tasks;
		4	using Implab.Components;
		5	using Xunit;
		6
		7	namespace Implab.Test
		8	{
		9	class TimeLog : PollingComponent {
		10	public TimeLog() : base(true) {
		11	}
		12
		13	protected override Task Poll(CancellationToken ct) {
		14	Console.WriteLine("Poll");
		15	return Task.CompletedTask;
		16	}
		17	}
		18
		19	public class UnitTest1
		20	{
		21	[Fact]
		22	public async Task Test1()
		23	{
		24
		25	using(var tl = new TimeLog()) {
		26	tl.StateChanged += (self, args) => Console.WriteLine("{0}", args.State);
		27	tl.Delay = 1000;
		28	tl.Interval = 500;
		29
		30
		31	tl.Start(CancellationToken.None);
		32	await tl.Completion;
		33
		34	await Task.Delay(2000);
		35
		36	tl.Stop(CancellationToken.None);
		37	await tl.Completion;
		38	await Task.Delay(3000);
		39	}
		40	}
		41	}
		42	}

Implab.Test/Implab.Test.csproj +4 -4

              <Project Sdk="Microsoft.NET.Sdk">
                <PropertyGroup>
-                 <TargetFramework>net46</TargetFramework>
-                 <FrameworkPathOverride Condition="'$(TargetFramework)'=='net46' and '$(OSTYPE)'=='linux'">/usr/lib/mono/4.5/</FrameworkPathOverride>
+                 <TargetFramework>netcoreapp2.1</TargetFramework>
                  <IsPackable>false</IsPackable>
                </PropertyGroup>
                <ItemGroup>
-                 <ProjectReference Include="../Implab/Implab.csproj" />
-                 <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+                 <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0-preview-20180109-01" />
                  <PackageReference Include="xunit" Version="2.3.1" />
                  <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+                 <ProjectReference Include="../Implab/Implab.csproj"/>
                  <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
                </ItemGroup>

Implab/Components/PollingComponent.cs +20 -4

                      readonly CancellationTokenSource m_cancellation = new CancellationTokenSource();
+                     Task m_pending;
+                     Task m_poll;
                      /// <summary>
                      /// Poll interval in milliseconds.
                      /// </summary>
                      }
-                     //TODO override stop
+                     protected override async Task StopInternalAsync(CancellationToken ct) {
+                         // component in Stopping state, no new polls will be scheduled
+                         m_cancellation.Cancel();
+                         try {
+                             // await for pending poll
+                             await m_poll;
+                         } catch (OperationCanceledException e) {
+                             // OK
+                         }
+                     }
                      protected abstract Task Poll(CancellationToken ct);
                      void ScheduleNextPoll(int timeout) {
                          lock (SynchronizationObject) {
-                             if (State == ExecutionState.Running)
+                             if (State == ExecutionState.Running) {
+                                 m_pending = Safe.CreateTask(m_cancellation.Token);
+                                 m_poll = m_pending.Then(() => Poll(m_cancellation.Token));
                                  m_timer.Change(timeout, Timeout.Infinite);
                          }
                      }
+                     }
-                     void OnTimer(object state) {
+                     async void OnTimer(object state) {
                          try {
-                             Poll(m_cancellation.Token);
+                             m_pending.Start();
+                             await m_poll;
                          } catch (Exception e) {
                              UnhandledException.DispatchEvent(this, new UnhandledExceptionEventArgs(e, false));
                              if (FailOnError)

Implab/PromiseExtensions.cs +9 0

                          }));
                      }
+                     public static PromiseAwaiter GetAwaiter(this IPromise that) {
+                         Safe.ArgumentNotNull(that, nameof(that));
+                         return new PromiseAwaiter(that);
+                     }
+                     public static PromiseAwaiter<T> GetAwaiter<T>(this IPromise<T> that) {
+                         Safe.ArgumentNotNull(that, nameof(that));
+                         return new PromiseAwaiter<T>(that);
+                     }
                  }
              }

Implab/Safe.cs +16 -5

              using System.Collections;
              using System.Runtime.CompilerServices;
              using System.Threading.Tasks;
+             using System.Threading;
              #if NET_4_5
              using System.Threading.Tasks;
                      public static void NoWait<T>(Task<T> promise) {
                      }
+                     public static void Noop() {
+                     }
+                     public static void Noop(CancellationToken ct) {
+                         ct.ThrowIfCancellationRequested();
+                     }
+                     public static Task CreateTask() {
+                         return new Task(Noop);
+                     }
+                     public static Task CreateTask(CancellationToken ct) {
+                         return new Task(Noop, ct);
+                     }
                      [DebuggerStepThrough]
                      public static IPromise<T> Run<T>(Func<IPromise<T>> action) {
                          ArgumentNotNull(action, "action");
                          }
                      }
-             #if NET_4_5
-                     public static void NoWait(Task t) {
+                     }
-             #endif
                  }
              }

Implab.Test/UnitTest1.cs removed 0 -40

NO CONTENT: file was removed

General Comments 3

sergey

|

Auto status change to "Under Review"

sergey

|

ok, latest stable version should be in default

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages