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

Remove null-conditional operators and asserts (Blocks must return to pools)

This commit is contained in:
clrjunkie 2016-01-09 19:36:26 +02:00
parent 849ff2016c
commit 8260e5d93f
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Microsoft.AspNet.Server.Kestrel/Filter/StreamSocketOutput.cs
View File

@ -51,11 +51,11 @@ namespace Microsoft.AspNet.Server.Kestrel.Filter
var returnBlock = block; var returnBlock = block;
block = block.Next; block = block.Next;
returnBlock.Pool?.Return(returnBlock); returnBlock.Pool.Return(returnBlock);
} }
_outputStream.Write(end.Block.Array, end.Block.Data.Offset, end.Index - end.Block.Data.Offset); _outputStream.Write(end.Block.Array, end.Block.Data.Offset, end.Index - end.Block.Data.Offset);
end.Block.Pool?.Return(end.Block); end.Block.Pool.Return(end.Block);
} }
} }
} }

8
src/Microsoft.AspNet.Server.Kestrel/Http/SocketOutput.cs
View File

@ -241,7 +241,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
var returningBlock = block; var returningBlock = block;
block = returningBlock.Next; block = returningBlock.Next;
returningBlock.Pool?.Return(returningBlock); returningBlock.Pool.Return(returningBlock);
} }
} }
@ -341,13 +341,13 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
var returnBlock = block; var returnBlock = block;
block = block.Next; block = block.Next;
returnBlock.Pool?.Return(returnBlock); returnBlock.Pool.Return(returnBlock);
} }
// Only return the _tail if we aren't between ProducingStart/Complete calls // Only return the _tail if we aren't between ProducingStart/Complete calls
if (_lastStart.IsDefault) if (_lastStart.IsDefault)
{ {
_tail.Pool?.Return(_tail); _tail.Pool.Return(_tail);
} }
_head = null; _head = null;
@ -559,7 +559,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
block = block.Next; block = block.Next;
returnBlock.Unpin(); returnBlock.Unpin();
returnBlock.Pool?.Return(returnBlock); returnBlock.Pool.Return(returnBlock);
} }
} }

2
src/Microsoft.AspNet.Server.Kestrel/Infrastructure/MemoryPoolIterator2.cs
View File

@ -695,7 +695,6 @@ namespace Microsoft.AspNet.Server.Kestrel.Infrastructure
public void CopyFrom(byte[] data, int offset, int count) public void CopyFrom(byte[] data, int offset, int count)
{ {
Debug.Assert(_block != null); Debug.Assert(_block != null);
Debug.Assert(_block.Pool != null);
Debug.Assert(_block.Next == null); Debug.Assert(_block.Next == null);
Debug.Assert(_block.End == _index); Debug.Assert(_block.End == _index);
@ -738,7 +737,6 @@ namespace Microsoft.AspNet.Server.Kestrel.Infrastructure
public unsafe void CopyFromAscii(string data) public unsafe void CopyFromAscii(string data)
{ {
Debug.Assert(_block != null); Debug.Assert(_block != null);
Debug.Assert(_block.Pool != null);
Debug.Assert(_block.Next == null); Debug.Assert(_block.Next == null);
Debug.Assert(_block.End == _index); Debug.Assert(_block.End == _index);