huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix #4631 and avoid Task<T> creation in invoker 

This change corrects and ordering bug between the creation of the
'context' and the diagnostic source event that occurs before a synchronous
filter's 'after' stage.

Also made some simple changes to avoid allocating Task<T> in many common
cases. Now we'll only create the Task<T> when we really need it (async
filters).
This commit is contained in:
Ryan Nowak 2016-05-13 08:53:56 -07:00
parent 128d74e2a0
commit 652e330875
1 changed files with 52 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/Microsoft.AspNetCore.Mvc.Core/Internal/FilterActionInvoker.cs
View File

@ -227,7 +227,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
return InvokeResourceFilterAsync(); return InvokeResourceFilterAsync();
} }
private async Task<ResourceExecutedContext> InvokeResourceFilterAsync() private async Task<ResourceExecutedContext> InvokeResourceFilterAwaitedAsync()
{ {
Debug.Assert(_resourceExecutingContext != null); Debug.Assert(_resourceExecutingContext != null);
@ -243,6 +243,16 @@ namespace Microsoft.AspNetCore.Mvc.Internal
throw new InvalidOperationException(message); throw new InvalidOperationException(message);
} }
await InvokeResourceFilterAsync();
Debug.Assert(_resourceExecutedContext != null);
return _resourceExecutedContext;
}
private async Task InvokeResourceFilterAsync()
{
Debug.Assert(_resourceExecutingContext != null);
var item = _cursor.GetNextFilter<IResourceFilter, IAsyncResourceFilter>(); var item = _cursor.GetNextFilter<IResourceFilter, IAsyncResourceFilter>();
try try
{ {
@ -250,7 +260,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
{ {
_diagnosticSource.BeforeOnResourceExecution(_resourceExecutingContext, item.FilterAsync); _diagnosticSource.BeforeOnResourceExecution(_resourceExecutingContext, item.FilterAsync);
await item.FilterAsync.OnResourceExecutionAsync(_resourceExecutingContext, InvokeResourceFilterAsync); await item.FilterAsync.OnResourceExecutionAsync(_resourceExecutingContext, InvokeResourceFilterAwaitedAsync);
_diagnosticSource.AfterOnResourceExecution(_resourceExecutedContext, item.FilterAsync); _diagnosticSource.AfterOnResourceExecution(_resourceExecutedContext, item.FilterAsync);
@ -294,9 +304,12 @@ namespace Microsoft.AspNetCore.Mvc.Internal
} }
else else
{ {
await InvokeResourceFilterAsync();
Debug.Assert(_resourceExecutedContext != null);
_diagnosticSource.BeforeOnResourceExecuted(_resourceExecutedContext, item.Filter); _diagnosticSource.BeforeOnResourceExecuted(_resourceExecutedContext, item.Filter);
item.Filter.OnResourceExecuted(await InvokeResourceFilterAsync()); item.Filter.OnResourceExecuted(_resourceExecutedContext);
_diagnosticSource.AfterOnResourceExecuted(_resourceExecutedContext, item.Filter); _diagnosticSource.AfterOnResourceExecuted(_resourceExecutedContext, item.Filter);
} }
@ -359,7 +372,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal
} }
Debug.Assert(_resourceExecutedContext != null); Debug.Assert(_resourceExecutedContext != null);
return _resourceExecutedContext;
} }
private Task InvokeAllExceptionFiltersAsync() private Task InvokeAllExceptionFiltersAsync()
@ -463,7 +475,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
await InvokeActionFilterAsync(); await InvokeActionFilterAsync();
} }
private async Task<ActionExecutedContext> InvokeActionFilterAsync() private async Task<ActionExecutedContext> InvokeActionFilterAwaitedAsync()
{ {
Debug.Assert(_actionExecutingContext != null); Debug.Assert(_actionExecutingContext != null);
if (_actionExecutingContext.Result != null) if (_actionExecutingContext.Result != null)
@ -478,6 +490,16 @@ namespace Microsoft.AspNetCore.Mvc.Internal
throw new InvalidOperationException(message); throw new InvalidOperationException(message);
} }
await InvokeActionFilterAsync();
Debug.Assert(_actionExecutedContext != null);
return _actionExecutedContext;
}
private async Task InvokeActionFilterAsync()
{
Debug.Assert(_actionExecutingContext != null);
var item = _cursor.GetNextFilter<IActionFilter, IAsyncActionFilter>(); var item = _cursor.GetNextFilter<IActionFilter, IAsyncActionFilter>();
try try
{ {
@ -485,7 +507,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
{ {
_diagnosticSource.BeforeOnActionExecution(_actionExecutingContext, item.FilterAsync); _diagnosticSource.BeforeOnActionExecution(_actionExecutingContext, item.FilterAsync);
await item.FilterAsync.OnActionExecutionAsync(_actionExecutingContext, InvokeActionFilterAsync); await item.FilterAsync.OnActionExecutionAsync(_actionExecutingContext, InvokeActionFilterAwaitedAsync);
_diagnosticSource.AfterOnActionExecution(_actionExecutedContext, item.FilterAsync); _diagnosticSource.AfterOnActionExecution(_actionExecutedContext, item.FilterAsync);
@ -528,9 +550,12 @@ namespace Microsoft.AspNetCore.Mvc.Internal
} }
else else
{ {
await InvokeActionFilterAsync();
Debug.Assert(_actionExecutedContext != null);
_diagnosticSource.BeforeOnActionExecuted(_actionExecutedContext, item.Filter); _diagnosticSource.BeforeOnActionExecuted(_actionExecutedContext, item.Filter);
item.Filter.OnActionExecuted(await InvokeActionFilterAsync()); item.Filter.OnActionExecuted(_actionExecutedContext);
_diagnosticSource.BeforeOnActionExecuted(_actionExecutedContext, item.Filter); _diagnosticSource.BeforeOnActionExecuted(_actionExecutedContext, item.Filter);
} }
@ -578,7 +603,8 @@ namespace Microsoft.AspNetCore.Mvc.Internal
ExceptionDispatchInfo = ExceptionDispatchInfo.Capture(exception) ExceptionDispatchInfo = ExceptionDispatchInfo.Capture(exception)
}; };
} }
return _actionExecutedContext;
Debug.Assert(_actionExecutedContext != null);
} }
private async Task InvokeAllResultFiltersAsync(IActionResult result) private async Task InvokeAllResultFiltersAsync(IActionResult result)
@ -603,9 +629,10 @@ namespace Microsoft.AspNetCore.Mvc.Internal
} }
} }
private async Task<ResultExecutedContext> InvokeResultFilterAsync() private async Task<ResultExecutedContext> InvokeResultFilterAwaitedAsync()
{ {
Debug.Assert(_resultExecutingContext != null); Debug.Assert(_resultExecutingContext != null);
if (_resultExecutingContext.Cancel == true) if (_resultExecutingContext.Cancel == true)
{ {
// If we get here, it means that an async filter set cancel == true AND called next(). // If we get here, it means that an async filter set cancel == true AND called next().
@ -619,6 +646,16 @@ namespace Microsoft.AspNetCore.Mvc.Internal
throw new InvalidOperationException(message); throw new InvalidOperationException(message);
} }
await InvokeResultFilterAsync();
Debug.Assert(_resultExecutedContext != null);
return _resultExecutedContext;
}
private async Task InvokeResultFilterAsync()
{
Debug.Assert(_resultExecutingContext != null);
try try
{ {
var item = _cursor.GetNextFilter<IResultFilter, IAsyncResultFilter>(); var item = _cursor.GetNextFilter<IResultFilter, IAsyncResultFilter>();
@ -626,7 +663,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
{ {
_diagnosticSource.BeforeOnResultExecution(_resultExecutingContext, item.FilterAsync); _diagnosticSource.BeforeOnResultExecution(_resultExecutingContext, item.FilterAsync);
await item.FilterAsync.OnResultExecutionAsync(_resultExecutingContext, InvokeResultFilterAsync); await item.FilterAsync.OnResultExecutionAsync(_resultExecutingContext, InvokeResultFilterAwaitedAsync);
_diagnosticSource.AfterOnResultExecution(_resultExecutedContext, item.FilterAsync); _diagnosticSource.AfterOnResultExecution(_resultExecutedContext, item.FilterAsync);
@ -669,9 +706,12 @@ namespace Microsoft.AspNetCore.Mvc.Internal
} }
else else
{ {
await InvokeResultFilterAsync();
Debug.Assert(_resultExecutedContext != null);
_diagnosticSource.BeforeOnResultExecuted(_resultExecutedContext, item.Filter); _diagnosticSource.BeforeOnResultExecuted(_resultExecutedContext, item.Filter);
item.Filter.OnResultExecuted(await InvokeResultFilterAsync()); item.Filter.OnResultExecuted(_resultExecutedContext);
_diagnosticSource.AfterOnResultExecuted(_resultExecutedContext, item.Filter); _diagnosticSource.AfterOnResultExecuted(_resultExecutedContext, item.Filter);
} }
@ -708,7 +748,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
}; };
} }
return _resultExecutedContext; Debug.Assert(_resultExecutedContext != null);
} }
private async Task InvokeResultAsync(IActionResult result) private async Task InvokeResultAsync(IActionResult result)