提交 9f272849 编写于 作者: T Tomas Matousek

Use ReportFatalError in TaskFactory helpers

上级 88b2fb25
......@@ -303,12 +303,7 @@ public static T WaitAndGetResult<T>(this Task<T> task, CancellationToken cancell
// the behavior we want.
// This is the only place in the code where we're allowed to call ContinueWith.
var nextTask = task.ContinueWith(continuationFunction, cancellationToken, continuationOptions | TaskContinuationOptions.LazyCancellation, scheduler).Unwrap();
nextTask.ContinueWith(ReportFatalError, continuationFunction,
CancellationToken.None,
TaskContinuationOptions.OnlyOnFaulted | TaskContinuationOptions.ExecuteSynchronously,
TaskScheduler.Default);
ReportFatalError(nextTask, continuationFunction);
return nextTask;
}
......@@ -340,8 +335,16 @@ public static T WaitAndGetResult<T>(this Task<T> task, CancellationToken cancell
cancellationToken, taskContinuationOptions, scheduler).Unwrap();
}
internal static void ReportFatalError(Task task, object continuationFunction)
{
task.ContinueWith(ReportFatalErrorWorker, continuationFunction,
CancellationToken.None,
TaskContinuationOptions.OnlyOnFaulted | TaskContinuationOptions.ExecuteSynchronously,
TaskScheduler.Default);
}
[MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)]
private static void ReportFatalError(Task task, object continuationFunction)
private static void ReportFatalErrorWorker(Task task, object continuationFunction)
{
var exception = task.Exception;
var methodInfo = ((Delegate)continuationFunction).GetMethodInfo();
......
......@@ -81,13 +81,7 @@ public static Task SafeStartNewFromAsync(this TaskFactory factory, Func<Task> ac
{
// The one and only place we can call StartNew<>().
var task = factory.StartNew(actionAsync, cancellationToken, creationOptions, scheduler).Unwrap();
// make it crash if exception has thrown
task.ContinueWith(t => FatalError.Report(t.Exception),
CancellationToken.None,
TaskContinuationOptions.OnlyOnFaulted | TaskContinuationOptions.ExecuteSynchronously,
TaskScheduler.Default);
TaskExtensions.ReportFatalError(task, actionAsync);
return task;
}
......@@ -105,13 +99,7 @@ public static Task<TResult> SafeStartNewFromAsync<TResult>(this TaskFactory fact
{
// The one and only place we can call StartNew<>().
var task = factory.StartNew(funcAsync, cancellationToken, creationOptions, scheduler).Unwrap();
// make it crash if exception has thrown
task.ContinueWith(t => FatalError.Report(t.Exception),
CancellationToken.None,
TaskContinuationOptions.OnlyOnFaulted | TaskContinuationOptions.ExecuteSynchronously,
TaskScheduler.Default);
TaskExtensions.ReportFatalError(task, funcAsync);
return task;
}
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册