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

Fix issues with "TimeoutAfter"

Browse Source
This commit is contained in:
Christian Kratky
2017-09-19 23:08:18 +02:00
parent 493c934463
commit 9b8af2455f
1 changed files with 78 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MQTTnet.Core/Internal/TaskExtensions.cs
+78 -38
View File
@@ -7,51 +7,91 @@ namespace MQTTnet.Core.Internal
{ {
public static class TaskExtensions public static class TaskExtensions
{ {
public static Task TimeoutAfter(this Task task, TimeSpan timeout) public static async Task TimeoutAfter(this Task task, TimeSpan timeout)
{ {
return TimeoutAfter(task.ContinueWith(t => 0), timeout); var timeoutTask = Task.Delay(timeout);
var finishedTask = await Task.WhenAny(timeoutTask, task).ConfigureAwait(false);
if (finishedTask == timeoutTask || task.IsCanceled)
{
throw new MqttCommunicationTimedOutException();
}
if (task.IsCanceled)
{
throw new TaskCanceledException();
}
if (task.IsFaulted)
{
throw new MqttCommunicationException(task.Exception);
}
////return TimeoutAfter(task.ContinueWith(t => 0), timeout);
} }
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()) var timeoutTask = Task.Delay(timeout);
var finishedTask = await Task.WhenAny(timeoutTask, task).ConfigureAwait(false);
if (finishedTask == timeoutTask)
{ {
var tcs = new TaskCompletionSource<TResult>(); throw new MqttCommunicationTimedOutException();
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);
}
}, cancellationTokenSource.Token);
cancellationTokenSource.CancelAfter(timeout);
return await tcs.Task;
}
catch (TaskCanceledException)
{
throw new MqttCommunicationTimedOutException();
}
catch (Exception e)
{
throw new MqttCommunicationException(e);
}
} }
if (task.IsCanceled)
{
throw new TaskCanceledException();
}
if (task.IsFaulted)
{
throw new MqttCommunicationException(task.Exception);
}
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);
//// }
//// }
} }
} }
} }