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

Use the OnWriterCompleted and OnReaderCompleted events directly. (#2280)

This commit is contained in:
David Fowler 2018-01-29 14:27:47 -08:00 committed by GitHub
parent 50b396cec6
commit 8ea181f088
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/Kestrel.Core/Internal/HttpConnectionMiddleware.cs
View File

@ -1,6 +1,4 @@
using System; using System.Collections.Generic;
using System.Collections.Generic;
using System.IO.Pipelines;
using System.Net; using System.Net;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -9,15 +7,11 @@ using Microsoft.AspNetCore.Http.Features;
using Microsoft.AspNetCore.Protocols; using Microsoft.AspNetCore.Protocols;
using Microsoft.AspNetCore.Protocols.Features; using Microsoft.AspNetCore.Protocols.Features;
using Microsoft.AspNetCore.Server.Kestrel.Core.Adapter.Internal; using Microsoft.AspNetCore.Server.Kestrel.Core.Adapter.Internal;
using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http;
using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2;
namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal
{ {
public class HttpConnectionMiddleware<TContext> public class HttpConnectionMiddleware<TContext>
{ {
private static Action<Exception, object> _completeTcs = CompleteTcs;
private static long _lastHttpConnectionId = long.MinValue; private static long _lastHttpConnectionId = long.MinValue;
private readonly IList<IConnectionAdapter> _connectionAdapters; private readonly IList<IConnectionAdapter> _connectionAdapters;
@ -74,42 +68,20 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal
var connection = new HttpConnection(httpConnectionContext); var connection = new HttpConnection(httpConnectionContext);
var processingTask = connection.StartRequestProcessing(_application); var processingTask = connection.StartRequestProcessing(_application);
var inputTcs = new TaskCompletionSource<object>(); connectionContext.Transport.Input.OnWriterCompleted((error, state) =>
var outputTcs = new TaskCompletionSource<object>();
// The reason we don't fire events directly from these callbacks is because it seems
// like the transport callbacks root the state object (even after it fires)
connectionContext.Transport.Input.OnWriterCompleted(_completeTcs, inputTcs);
connectionContext.Transport.Output.OnReaderCompleted(_completeTcs, outputTcs);
inputTcs.Task.ContinueWith((task, state) =>
{ {
((HttpConnection)state).Abort(task.Exception?.InnerException); ((HttpConnection)state).Abort(error);
}, },
connection, TaskContinuationOptions.ExecuteSynchronously); connection);
outputTcs.Task.ContinueWith((task, state) => connectionContext.Transport.Output.OnReaderCompleted((error, state) =>
{ {
((HttpConnection)state).OnConnectionClosed(task.Exception?.InnerException); ((HttpConnection)state).OnConnectionClosed(error);
}, },
connection, TaskContinuationOptions.ExecuteSynchronously); connection);
return processingTask; return processingTask;
} }
private static void CompleteTcs(Exception error, object state)
{
var tcs = (TaskCompletionSource<object>)state;
if (error != null)
{
tcs.TrySetException(error);
}
else
{
tcs.TrySetResult(null);
}
}
} }
} }