YangWX/MQTTnet
1
0
Fork 0
mirror of https://github.com/dotnet/MQTTnet.git synced 2026-10-19 19:13:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
Christian Kratky
2017-09-20 21:28:18 +02:00
parent 8131995006
commit dcf6f94d77
4 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+2
View File
@@ -286,4 +286,6 @@ __pycache__/
*.btm.cs *.btm.cs
*.odx.cs *.odx.cs
*.xsd.cs *.xsd.cs
Build/nuget.exe Build/nuget.exe
MQTTnet.Core/Internal/TaskExtensions.cs
+12 -12
View File
@@ -7,28 +7,28 @@ namespace MQTTnet.Core.Internal
{ {
public static class TaskExtensions public static class TaskExtensions
{ {
public static async Task TimeoutAfter( this Task task, TimeSpan timeout ) public static async Task TimeoutAfter(this Task task, TimeSpan timeout)
{ {
using ( var cancellationTokenSource = new CancellationTokenSource() ) using (var cancellationTokenSource = new CancellationTokenSource())
{ {
try try
{ {
var timeoutTask = Task.Delay(timeout, cancellationTokenSource.Token); var timeoutTask = Task.Delay(timeout, cancellationTokenSource.Token);
var finishedTask = await Task.WhenAny(timeoutTask, task).ConfigureAwait(false); var finishedTask = await Task.WhenAny(timeoutTask, task).ConfigureAwait(false);
if ( finishedTask == timeoutTask ) if (finishedTask == timeoutTask)
{ {
throw new MqttCommunicationTimedOutException(); throw new MqttCommunicationTimedOutException();
} }
if ( task.IsCanceled ) if (task.IsCanceled)
{ {
throw new TaskCanceledException(); throw new TaskCanceledException();
} }
if ( task.IsFaulted ) if (task.IsFaulted)
{ {
throw new MqttCommunicationException( task.Exception.GetBaseException() ); throw new MqttCommunicationException(task.Exception.GetBaseException());
} }
} }
finally finally
@@ -38,28 +38,28 @@ namespace MQTTnet.Core.Internal
} }
} }
public static async Task<TResult> TimeoutAfter<TResult>( this Task<TResult> task, TimeSpan timeout ) public static async Task<TResult> TimeoutAfter<TResult>(this Task<TResult> task, TimeSpan timeout)
{ {
using ( var cancellationTokenSource = new CancellationTokenSource() ) using (var cancellationTokenSource = new CancellationTokenSource())
{ {
try try
{ {
var timeoutTask = Task.Delay(timeout, cancellationTokenSource.Token); var timeoutTask = Task.Delay(timeout, cancellationTokenSource.Token);
var finishedTask = await Task.WhenAny(timeoutTask, task).ConfigureAwait(false); var finishedTask = await Task.WhenAny(timeoutTask, task).ConfigureAwait(false);
if ( finishedTask == timeoutTask ) if (finishedTask == timeoutTask)
{ {
throw new MqttCommunicationTimedOutException(); throw new MqttCommunicationTimedOutException();
} }
if ( task.IsCanceled ) if (task.IsCanceled)
{ {
throw new TaskCanceledException(); throw new TaskCanceledException();
} }
if ( task.IsFaulted ) if (task.IsFaulted)
{ {
throw new MqttCommunicationException( task.Exception.GetBaseException() ); throw new MqttCommunicationException(task.Exception.GetBaseException());
} }
return task.Result; return task.Result;
MQTTnet.Core/MQTTnet.Core.csproj
+1 -1
View File
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard1.3</TargetFramework> <TargetFramework>netstandard1.1</TargetFramework>
<AssemblyName>MQTTnet.Core</AssemblyName> <AssemblyName>MQTTnet.Core</AssemblyName>
<RootNamespace>MQTTnet.Core</RootNamespace> <RootNamespace>MQTTnet.Core</RootNamespace>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild> <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
Tests/MQTTnet.Core.Tests/ExtensionTests.cs
+5 -5
View File
@@ -75,15 +75,15 @@ namespace MQTTnet.Core.Tests
var tasks = Enumerable.Range(0, 100000) var tasks = Enumerable.Range(0, 100000)
.Select(i => Task.Delay(TimeSpan.FromMilliseconds(1)).TimeoutAfter(TimeSpan.FromMinutes(1))); .Select(i => Task.Delay(TimeSpan.FromMilliseconds(1)).TimeoutAfter(TimeSpan.FromMinutes(1)));
await Task.WhenAll( tasks ); await Task.WhenAll(tasks);
AssertIsLess( 3_000_000, GC.GetTotalMemory( true ) ); AssertIsLess(3_000_000, GC.GetTotalMemory(true));
} }
private void AssertIsLess( long bound, long actual ) private static void AssertIsLess(long bound, long actual)
{ {
if ( bound < actual ) if (bound < actual)
{ {
Assert.Fail( $"value must be less than {bound:N0} but is {actual:N0}" ); Assert.Fail($"value must be less than {bound:N0} but is {actual:N0}");
} }
} }
} }