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

improved timeout after memory usage

Browse Source
This commit is contained in:
Eggers Jan
2017-09-20 09:33:41 +02:00
parent f287bd4d1d
commit b5b87f5272
2 changed files with 71 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MQTTnet.Core/Internal/TaskExtensions.cs
+52 -75
View File
@@ -7,91 +7,68 @@ namespace MQTTnet.Core.Internal
{
public static class TaskExtensions
{
public static async Task TimeoutAfter(this Task task, TimeSpan timeout)
public static async Task TimeoutAfter( this Task task, TimeSpan timeout )
{
var timeoutTask = Task.Delay(timeout);
var finishedTask = await Task.WhenAny(timeoutTask, task).ConfigureAwait(false);
if (finishedTask == timeoutTask)
using ( var cancellationTokenSource = new CancellationTokenSource() )
{
throw new MqttCommunicationTimedOutException();
}
try
{
var timeoutTask = Task.Delay(timeout, cancellationTokenSource.Token);
var finishedTask = await Task.WhenAny(timeoutTask, task).ConfigureAwait(false);
if (task.IsCanceled)
{
throw new TaskCanceledException();
}
if ( finishedTask == timeoutTask )
{
throw new MqttCommunicationTimedOutException();
}
if (task.IsFaulted)
{
throw new MqttCommunicationException(task.Exception.GetBaseException());
}
if ( task.IsCanceled )
{
throw new TaskCanceledException();
}
////return TimeoutAfter(task.ContinueWith(t => 0), timeout);
if ( task.IsFaulted )
{
throw new MqttCommunicationException( task.Exception.GetBaseException() );
}
}
finally
{
cancellationTokenSource.Cancel();
}
}
}
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 )
{
var timeoutTask = Task.Delay(timeout);
var finishedTask = await Task.WhenAny(timeoutTask, task).ConfigureAwait(false);
if (finishedTask == timeoutTask)
using ( var cancellationTokenSource = new CancellationTokenSource() )
{
throw new MqttCommunicationTimedOutException();
try
{
var timeoutTask = Task.Delay(timeout, cancellationTokenSource.Token);
var finishedTask = await Task.WhenAny(timeoutTask, task).ConfigureAwait(false);
if ( finishedTask == timeoutTask )
{
throw new MqttCommunicationTimedOutException();
}
if ( task.IsCanceled )
{
throw new TaskCanceledException();
}
if ( task.IsFaulted )
{
throw new MqttCommunicationException( task.Exception.GetBaseException() );
}
return task.Result;
}
finally
{
cancellationTokenSource.Cancel();
}
}
if (task.IsCanceled)
{
throw new TaskCanceledException();
}
if (task.IsFaulted)
{
throw new MqttCommunicationException(task.Exception.GetBaseException());
}
return task.Result;
//// using (var cancellationTokenSource = new CancellationTokenSource())
//// {
//// var tcs = new TaskCompletionSource<TResult>();
//// cancellationTokenSource.Token.Register(() =>
//// {
//// tcs.TrySetCanceled();
//// });
//// try
//// {
////#pragma warning disable 4014
//// task.ContinueWith(t =>
////#pragma warning restore 4014
//// {
//// if (t.IsFaulted)
//// {
//// tcs.TrySetException(t.Exception);
//// }
//// if (t.IsCompleted)
//// {
//// tcs.TrySetResult(t.Result);
//// }
//// return t.Result;
//// }, cancellationTokenSource.Token).ConfigureAwait(false);
//// cancellationTokenSource.CancelAfter(timeout);
//// return await tcs.Task.ConfigureAwait(false);
//// }
//// catch (TaskCanceledException)
//// {
//// throw new MqttCommunicationTimedOutException();
//// }
//// catch (Exception e)
//// {
//// throw new MqttCommunicationException(e);
//// }
//// }
}
}
}
Tests/MQTTnet.Core.Tests/ExtensionTests.cs
+19
View File
@@ -1,4 +1,5 @@
using System;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using MQTTnet.Core.Exceptions;
@@ -67,5 +68,23 @@ namespace MQTTnet.Core.Tests
Assert.IsTrue(e.InnerException is IndexOutOfRangeException);
}
}
[TestMethod]
public async Task TimeoutAfterMemoryUsage()
{
var tasks = Enumerable.Range(0, 100000)
.Select(i => Task.Delay(TimeSpan.FromMilliseconds(1)).TimeoutAfter(TimeSpan.FromMinutes(1)));
await Task.WhenAll( tasks );
AssertIsLess( 3_000_000, GC.GetTotalMemory( true ) );
}
private void AssertIsLess( long bound, long actual )
{
if ( bound < actual )
{
Assert.Fail( $"value must be less than {bound:N0} but is {actual:N0}" );
}
}
}
}