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

Protect SocketInput against concurrent consumption

This commit is contained in:
Stephen Halter 2016-01-06 17:08:25 -08:00
parent f3a39d98da
commit b63dd40efb
2 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Microsoft.AspNet.Server.Kestrel/Http/SocketInput.cs
View File

@ -25,6 +25,8 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
private MemoryPoolBlock2 _tail; private MemoryPoolBlock2 _tail;
private MemoryPoolBlock2 _pinned; private MemoryPoolBlock2 _pinned;
private int _consumingState;
public SocketInput(MemoryPool2 memory, IThreadPool threadPool) public SocketInput(MemoryPool2 memory, IThreadPool threadPool)
{ {
_memory = memory; _memory = memory;
@ -81,10 +83,8 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
public void IncomingComplete(int count, Exception error) public void IncomingComplete(int count, Exception error)
{ {
// Unpin may called without an earlier Pin
if (_pinned != null) if (_pinned != null)
{ {
_pinned.End += count; _pinned.End += count;
if (_head == null) if (_head == null)
@ -133,6 +133,11 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
public MemoryPoolIterator2 ConsumingStart() public MemoryPoolIterator2 ConsumingStart()
{ {
if (Interlocked.CompareExchange(ref _consumingState, 1, 0) != 0)
{
throw new InvalidOperationException("Already consuming input.");
}
return new MemoryPoolIterator2(_head); return new MemoryPoolIterator2(_head);
} }
@ -142,6 +147,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
{ {
MemoryPoolBlock2 returnStart = null; MemoryPoolBlock2 returnStart = null;
MemoryPoolBlock2 returnEnd = null; MemoryPoolBlock2 returnEnd = null;
if (!consumed.IsDefault) if (!consumed.IsDefault)
{ {
returnStart = _head; returnStart = _head;
@ -149,6 +155,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
_head = consumed.Block; _head = consumed.Block;
_head.Start = consumed.Index; _head.Start = consumed.Index;
} }
if (!examined.IsDefault && if (!examined.IsDefault &&
examined.IsEnd && examined.IsEnd &&
RemoteIntakeFin == false && RemoteIntakeFin == false &&
@ -156,7 +163,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
{ {
_manualResetEvent.Reset(); _manualResetEvent.Reset();
var awaitableState = Interlocked.CompareExchange( Interlocked.CompareExchange(
ref _awaitableState, ref _awaitableState,
_awaitableIsNotCompleted, _awaitableIsNotCompleted,
_awaitableIsCompleted); _awaitableIsCompleted);
@ -168,6 +175,11 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
returnStart = returnStart.Next; returnStart = returnStart.Next;
returnBlock.Pool.Return(returnBlock); returnBlock.Pool.Return(returnBlock);
} }
if (Interlocked.CompareExchange(ref _consumingState, 0, 1) != 1)
{
throw new InvalidOperationException("No ongoing consuming operation to complete.");
}
} }
public void AbortAwaiting() public void AbortAwaiting()
@ -201,7 +213,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
{ {
_awaitableError = new InvalidOperationException("Concurrent reads are not supported."); _awaitableError = new InvalidOperationException("Concurrent reads are not supported.");
awaitableState = Interlocked.Exchange( Interlocked.Exchange(
ref _awaitableState, ref _awaitableState,
_awaitableIsCompleted); _awaitableIsCompleted);

21
test/Microsoft.AspNet.Server.KestrelTests/SocketInputTests.cs
View File

@ -78,6 +78,27 @@ namespace Microsoft.AspNet.Server.KestrelTests
} }
} }
[Fact]
public void ConsumingOutOfOrderFailsGracefully()
{
var defultIter = new MemoryPoolIterator2();
// Calling ConsumingComplete without a preceding calling to ConsumingStart fails
var socketInput = new SocketInput(null, null);
Assert.Throws<InvalidOperationException>(() => socketInput.ConsumingComplete(defultIter, defultIter));
// Calling ConsumingStart twice in a row fails
socketInput = new SocketInput(null, null);
socketInput.ConsumingStart();
Assert.Throws<InvalidOperationException>(() => socketInput.ConsumingStart());
// Calling ConsumingComplete twice in a row fails
socketInput = new SocketInput(null, null);
socketInput.ConsumingStart();
socketInput.ConsumingComplete(defultIter, defultIter);
Assert.Throws<InvalidOperationException>(() => socketInput.ConsumingComplete(defultIter, defultIter));
}
private static void TestConcurrentFaultedTask(Task t) private static void TestConcurrentFaultedTask(Task t)
{ {
Assert.True(t.IsFaulted); Assert.True(t.IsFaulted);