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

Remove Environment.StackTrace as crashing tests

This commit is contained in:
Ben Adams 2016-07-21 01:44:23 +01:00
parent aa385a1317
commit f42316af7f
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/MemoryPool.cs
View File

@ -82,7 +82,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure
#if DEBUG #if DEBUG
block.Leaser = memberName + ", " + sourceFilePath + ", " + sourceLineNumber; block.Leaser = memberName + ", " + sourceFilePath + ", " + sourceLineNumber;
block.IsLeased = true; block.IsLeased = true;
block.StackTrace = Environment.StackTrace;
#endif #endif
return block; return block;
} }
@ -91,7 +90,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure
#if DEBUG #if DEBUG
block.Leaser = memberName + ", " + sourceFilePath + ", " + sourceLineNumber; block.Leaser = memberName + ", " + sourceFilePath + ", " + sourceLineNumber;
block.IsLeased = true; block.IsLeased = true;
block.StackTrace = Environment.StackTrace;
#endif #endif
return block; return block;
} }
@ -148,7 +146,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure
{ {
#if DEBUG #if DEBUG
Debug.Assert(block.Pool == this, "Returned block was not leased from this pool"); Debug.Assert(block.Pool == this, "Returned block was not leased from this pool");
Debug.Assert(block.IsLeased, $"Block being returned to pool twice: {block.Leaser}{Environment.NewLine}{block.StackTrace}"); Debug.Assert(block.IsLeased, $"Block being returned to pool twice: {block.Leaser}{Environment.NewLine}");
block.IsLeased = false; block.IsLeased = false;
#endif #endif

3
src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/MemoryPoolBlock.cs
View File

@ -74,13 +74,12 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure
#if DEBUG #if DEBUG
public bool IsLeased { get; set; } public bool IsLeased { get; set; }
public string Leaser { get; set; } public string Leaser { get; set; }
public string StackTrace { get; set; }
#endif #endif
~MemoryPoolBlock() ~MemoryPoolBlock()
{ {
#if DEBUG #if DEBUG
Debug.Assert(Slab == null || !Slab.IsActive, $"{Environment.NewLine}{Environment.NewLine}*** Block being garbage collected instead of returned to pool: {Leaser} ***{Environment.NewLine}Allocation StackTrace:{Environment.NewLine}{StackTrace}"); Debug.Assert(Slab == null || !Slab.IsActive, $"{Environment.NewLine}{Environment.NewLine}*** Block being garbage collected instead of returned to pool: {Leaser} ***{Environment.NewLine}");
#endif #endif
if (Slab != null && Slab.IsActive) if (Slab != null && Slab.IsActive)
{ {