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

Be explicit about PipeScheduler.Inline (#2367)

This commit is contained in:
David Fowler 2018-03-06 09:58:14 -08:00 committed by GitHub
parent b86df651af
commit c88f949c39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/Kestrel.Core.Tests/OutputProducerTests.cs
View File

@ -34,7 +34,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
var pipeOptions = new PipeOptions var pipeOptions = new PipeOptions
( (
pool: _memoryPool, pool: _memoryPool,
readerScheduler: Mock.Of<PipeScheduler>() readerScheduler: Mock.Of<PipeScheduler>(),
writerScheduler: PipeScheduler.Inline
); );
using (var socketOutput = CreateOutputProducer(pipeOptions)) using (var socketOutput = CreateOutputProducer(pipeOptions))

2
test/Kestrel.Core.Tests/PipelineExtensionTests.cs
View File

@ -21,7 +21,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
public PipelineExtensionTests() public PipelineExtensionTests()
{ {
_pipe = new Pipe(new PipeOptions(_memoryPool)); _pipe = new Pipe(new PipeOptions(_memoryPool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline));
} }
public void Dispose() public void Dispose()

3
test/Kestrel.Core.Tests/TestInput.cs
View File

@ -22,7 +22,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
public TestInput() public TestInput()
{ {
_memoryPool = KestrelMemoryPool.Create(); _memoryPool = KestrelMemoryPool.Create();
var pair = DuplexPipe.CreateConnectionPair(_memoryPool); var options = new PipeOptions(pool: _memoryPool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline);
var pair = DuplexPipe.CreateConnectionPair(options, options);
Transport = pair.Transport; Transport = pair.Transport;
Application = pair.Application; Application = pair.Application;

11
test/Kestrel.Transport.Libuv.Tests/LibuvConnectionTests.cs
View File

@ -62,11 +62,13 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests
mockConnectionHandler.InputOptions = pool => mockConnectionHandler.InputOptions = pool =>
new PipeOptions( new PipeOptions(
pool: pool, pool: pool,
pauseWriterThreshold: 3); pauseWriterThreshold: 3,
readerScheduler: PipeScheduler.Inline,
writerScheduler: PipeScheduler.Inline);
// We don't set the output writer scheduler here since we want to run the callback inline // We don't set the output writer scheduler here since we want to run the callback inline
mockConnectionHandler.OutputOptions = pool => new PipeOptions(pool: pool, readerScheduler: thread); mockConnectionHandler.OutputOptions = pool => new PipeOptions(pool: pool, readerScheduler: thread, writerScheduler: PipeScheduler.Inline);
Task connectionTask = null; Task connectionTask = null;
@ -128,9 +130,10 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests
pool: pool, pool: pool,
pauseWriterThreshold: 3, pauseWriterThreshold: 3,
resumeWriterThreshold: 3, resumeWriterThreshold: 3,
writerScheduler: mockScheduler.Object); writerScheduler: mockScheduler.Object,
readerScheduler: PipeScheduler.Inline);
mockConnectionHandler.OutputOptions = pool => new PipeOptions(pool: pool, readerScheduler:thread ); mockConnectionHandler.OutputOptions = pool => new PipeOptions(pool: pool, readerScheduler: thread, writerScheduler: PipeScheduler.Inline);
Task connectionTask = null; Task connectionTask = null;
try try

9
test/Kestrel.Transport.Libuv.Tests/LibuvOutputConsumerTests.cs
View File

@ -67,6 +67,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests
( (
pool: _memoryPool, pool: _memoryPool,
readerScheduler: _libuvThread, readerScheduler: _libuvThread,
writerScheduler: PipeScheduler.Inline,
pauseWriterThreshold: maxResponseBufferSize ?? 0, pauseWriterThreshold: maxResponseBufferSize ?? 0,
resumeWriterThreshold: maxResponseBufferSize ?? 0 resumeWriterThreshold: maxResponseBufferSize ?? 0
); );
@ -103,6 +104,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests
( (
pool: _memoryPool, pool: _memoryPool,
readerScheduler: _libuvThread, readerScheduler: _libuvThread,
writerScheduler: PipeScheduler.Inline,
pauseWriterThreshold: 0, pauseWriterThreshold: 0,
resumeWriterThreshold: 0 resumeWriterThreshold: 0
); );
@ -151,6 +153,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests
( (
pool: _memoryPool, pool: _memoryPool,
readerScheduler: _libuvThread, readerScheduler: _libuvThread,
writerScheduler: PipeScheduler.Inline,
pauseWriterThreshold: 1, pauseWriterThreshold: 1,
resumeWriterThreshold: 1 resumeWriterThreshold: 1
); );
@ -207,6 +210,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests
( (
pool: _memoryPool, pool: _memoryPool,
readerScheduler: _libuvThread, readerScheduler: _libuvThread,
writerScheduler: PipeScheduler.Inline,
pauseWriterThreshold: maxResponseBufferSize, pauseWriterThreshold: maxResponseBufferSize,
resumeWriterThreshold: maxResponseBufferSize resumeWriterThreshold: maxResponseBufferSize
); );
@ -271,6 +275,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests
( (
pool: _memoryPool, pool: _memoryPool,
readerScheduler: _libuvThread, readerScheduler: _libuvThread,
writerScheduler: PipeScheduler.Inline,
pauseWriterThreshold: maxResponseBufferSize, pauseWriterThreshold: maxResponseBufferSize,
resumeWriterThreshold: maxResponseBufferSize resumeWriterThreshold: maxResponseBufferSize
); );
@ -435,6 +440,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests
( (
pool: _memoryPool, pool: _memoryPool,
readerScheduler: _libuvThread, readerScheduler: _libuvThread,
writerScheduler: PipeScheduler.Inline,
pauseWriterThreshold: maxResponseBufferSize, pauseWriterThreshold: maxResponseBufferSize,
resumeWriterThreshold: maxResponseBufferSize resumeWriterThreshold: maxResponseBufferSize
); );
@ -519,6 +525,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests
( (
pool: _memoryPool, pool: _memoryPool,
readerScheduler: _libuvThread, readerScheduler: _libuvThread,
writerScheduler: PipeScheduler.Inline,
pauseWriterThreshold: maxResponseBufferSize, pauseWriterThreshold: maxResponseBufferSize,
resumeWriterThreshold: maxResponseBufferSize resumeWriterThreshold: maxResponseBufferSize
); );
@ -601,6 +608,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests
( (
pool: _memoryPool, pool: _memoryPool,
readerScheduler: _libuvThread, readerScheduler: _libuvThread,
writerScheduler: PipeScheduler.Inline,
pauseWriterThreshold: maxResponseBufferSize, pauseWriterThreshold: maxResponseBufferSize,
resumeWriterThreshold: maxResponseBufferSize resumeWriterThreshold: maxResponseBufferSize
); );
@ -662,6 +670,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests
( (
pool: _memoryPool, pool: _memoryPool,
readerScheduler: _libuvThread, readerScheduler: _libuvThread,
writerScheduler: PipeScheduler.Inline,
pauseWriterThreshold: maxResponseBufferSize ?? 0, pauseWriterThreshold: maxResponseBufferSize ?? 0,
resumeWriterThreshold: maxResponseBufferSize ?? 0 resumeWriterThreshold: maxResponseBufferSize ?? 0
); );

4
test/Kestrel.Transport.Libuv.Tests/TestHelpers/MockConnectionHandler.cs
View File

@ -13,8 +13,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests.TestHelpers
{ {
public class MockConnectionHandler : IConnectionHandler public class MockConnectionHandler : IConnectionHandler
{ {
public Func<MemoryPool<byte>, PipeOptions> InputOptions { get; set; } = pool => new PipeOptions(pool); public Func<MemoryPool<byte>, PipeOptions> InputOptions { get; set; } = pool => new PipeOptions(pool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline);
public Func<MemoryPool<byte>, PipeOptions> OutputOptions { get; set; } = pool => new PipeOptions(pool); public Func<MemoryPool<byte>, PipeOptions> OutputOptions { get; set; } = pool => new PipeOptions(pool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline);
public void OnConnection(IFeatureCollection features) public void OnConnection(IFeatureCollection features)
{ {