Skip to content

Split pool and reader/writer into separate packages #343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pakrym merged 1 commit into from
Apr 24, 2018
Merged

Split pool and reader/writer into separate packages #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions NuGetPackageVerifier.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"Microsoft.AspNetCore.Analyzer.Testing": {},
"Microsoft.AspNetCore.BenchmarkRunner.Sources": {},
"Microsoft.Extensions.Buffers.Sources": {},
"Microsoft.Extensions.Buffers.MemoryPool.Sources": {},
"Microsoft.Extensions.Buffers.Testing.Sources": {},
"Microsoft.AspNetCore.Certificates.Generation.Sources": {},
"Microsoft.Extensions.ClosedGenericMatcher.Sources": {},
Expand Down
12 changes: 6 additions & 6 deletions ....Buffers.Sources/MemoryPoolBlock.Debug.cs → ...moryPool.Sources/MemoryPoolBlock.Debug.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public override Memory<byte> Memory
{
get
{
if (!Slab.IsActive) ThrowHelper.ThrowObjectDisposedException(ExceptionArgument.MemoryPoolBlock);
if (!Slab.IsActive) MemoryPoolThrowHelper.ThrowObjectDisposedException(MemoryPoolThrowHelper.ExceptionArgument.MemoryPoolBlock);

return CreateMemory(_length);
}
Expand Down Expand Up @@ -74,11 +74,11 @@ public override Memory<byte> Memory

protected override void Dispose(bool disposing)
{
if (!Slab.IsActive) ThrowHelper.ThrowObjectDisposedException(ExceptionArgument.MemoryPoolBlock);
if (!Slab.IsActive) MemoryPoolThrowHelper.ThrowObjectDisposedException(MemoryPoolThrowHelper.ExceptionArgument.MemoryPoolBlock);

if (Volatile.Read(ref _pinCount) > 0)
{
ThrowHelper.ThrowInvalidOperationException_ReturningPinnedBlock();
MemoryPoolThrowHelper.ThrowInvalidOperationException_ReturningPinnedBlock();
}

Pool.Return(this);
Expand All @@ -88,8 +88,8 @@ protected override void Dispose(bool disposing)

public override MemoryHandle Pin(int byteOffset = 0)
{
if (!Slab.IsActive) ThrowHelper.ThrowObjectDisposedException(ExceptionArgument.MemoryPoolBlock);
if (byteOffset < 0 || byteOffset > _length) ThrowHelper.ThrowArgumentOutOfRangeException(_length, byteOffset);
if (!Slab.IsActive) MemoryPoolThrowHelper.ThrowObjectDisposedException(MemoryPoolThrowHelper.ExceptionArgument.MemoryPoolBlock);
if (byteOffset < 0 || byteOffset > _length) MemoryPoolThrowHelper.ThrowArgumentOutOfRangeException(_length, byteOffset);

Interlocked.Increment(ref _pinCount);
unsafe
Expand All @@ -108,7 +108,7 @@ public override void Unpin()
{
if (Interlocked.Decrement(ref _pinCount) < 0)
{
ThrowHelper.ThrowInvalidOperationException_ReferenceCountZero();
MemoryPoolThrowHelper.ThrowInvalidOperationException_ReferenceCountZero();
}
}

Expand Down
6 changes: 3 additions & 3 deletions ...uffers.Sources/MemoryPoolBlock.Release.cs → ...ryPool.Sources/MemoryPoolBlock.Release.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ internal sealed class MemoryPoolBlock : IMemoryOwner<byte>
{
private readonly int _offset;
private readonly int _length;

/// <summary>
/// This object cannot be instantiated outside of the static Create method
/// </summary>
Expand All @@ -26,7 +26,7 @@ internal MemoryPoolBlock(SlabMemoryPool pool, MemoryPoolSlab slab, int offset, i

Pool = pool;
Slab = slab;

Memory = MemoryMarshal.CreateFromPinnedArray(slab.Array, _offset, _length);
}

Expand All @@ -53,7 +53,7 @@ internal MemoryPoolBlock(SlabMemoryPool pool, MemoryPoolSlab slab, int offset, i

public void Dispose()
{
if (!Slab.IsActive) ThrowHelper.ThrowObjectDisposedException(ExceptionArgument.MemoryPoolBlock);
if (!Slab.IsActive) MemoryPoolThrowHelper.ThrowObjectDisposedException(MemoryPoolThrowHelper.ExceptionArgument.MemoryPoolBlock);
Pool.Return(this);
}

Expand Down
0 ...ensions.Buffers.Sources/MemoryPoolSlab.cs → ...fers.MemoryPool.Sources/MemoryPoolSlab.cs
View file
Open in desktop
File renamed without changes.
18 changes: 9 additions & 9 deletions ...s.Buffers.Sources/PipelinesThrowHelper.cs → ...moryPool.Sources/MemoryPoolThrowHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace System.Buffers
{
internal class ThrowHelper
internal class MemoryPoolThrowHelper
{
public static void ThrowArgumentOutOfRangeException(int sourceLength, int offset)
{
Expand All @@ -30,7 +30,7 @@ public static void ThrowArgumentOutOfRangeException(ExceptionArgument argument)
{
throw GetArgumentOutOfRangeException(argument);
}

public static void ThrowInvalidOperationException_ReferenceCountZero()
{
throw new InvalidOperationException("Can't release when reference count is already zero");
Expand Down Expand Up @@ -75,13 +75,13 @@ private static string GetArgumentName(ExceptionArgument argument)

return argument.ToString();
}
}

internal enum ExceptionArgument
{
size,
offset,
length,
MemoryPoolBlock
internal enum ExceptionArgument
{
size,
offset,
length,
MemoryPoolBlock
}
}
}
2 changes: 1 addition & 1 deletion ...ensions.Buffers.Sources/SlabMemoryPool.cs → ...fers.MemoryPool.Sources/SlabMemoryPool.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public override IMemoryOwner<byte> Rent(int size = AnySize)
if (size == AnySize) size = _blockSize;
else if (size > _blockSize)
{
ThrowHelper.ThrowArgumentOutOfRangeException_BufferRequestTooLarge(_blockSize);
MemoryPoolThrowHelper.ThrowArgumentOutOfRangeException_BufferRequestTooLarge(_blockSize);
}

var block = Lease();
Expand Down
4 changes: 2 additions & 2 deletions shared/Microsoft.Extensions.Buffers.Sources/BufferReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public void Advance(int byteCount)
{
if (byteCount < 0)
{
ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.length);
BuffersThrowHelper.ThrowArgumentOutOfRangeException(BuffersThrowHelper.ExceptionArgument.length);
}

_consumedBytes += byteCount;
Expand All @@ -118,7 +118,7 @@ public void Advance(int byteCount)

if (byteCount > 0)
{
ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.length);
BuffersThrowHelper.ThrowArgumentOutOfRangeException(BuffersThrowHelper.ExceptionArgument.length);
}
}
}
Expand Down
34 changes: 34 additions & 0 deletions shared/Microsoft.Extensions.Buffers.Sources/BuffersThrowHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
// Copyright (c) Microsoft. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System.Diagnostics;
using System.Runtime.CompilerServices;

namespace System.Buffers
{
internal class BuffersThrowHelper
{
public static void ThrowArgumentOutOfRangeException(ExceptionArgument argument)
{
throw GetArgumentOutOfRangeException(argument);
}

[MethodImpl(MethodImplOptions.NoInlining)]
private static ArgumentOutOfRangeException GetArgumentOutOfRangeException(ExceptionArgument argument)
{
return new ArgumentOutOfRangeException(GetArgumentName(argument));
}

private static string GetArgumentName(ExceptionArgument argument)
{
Debug.Assert(Enum.IsDefined(typeof(ExceptionArgument), argument), "The enum value is not defined, please check the ExceptionArgument Enum.");

return argument.ToString();
}

internal enum ExceptionArgument
{
length,
}
}
}
3 changes: 2 additions & 1 deletion test/Microsoft.Extensions.Internal.Test/Microsoft.Extensions.Internal.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
Expand All @@ -10,6 +10,7 @@
<Compile Include="..\..\shared\Microsoft.AspNetCore.Certificates.Generation.Sources\**\*.cs" />
<Compile Include="..\..\shared\Microsoft.Extensions.ActivatorUtilities.Sources\**\*.cs" />
<Compile Include="..\..\shared\Microsoft.Extensions.Buffers.Sources\**\*.cs" />
<Compile Include="..\..\shared\Microsoft.Extensions.Buffers.MemoryPool.Sources\**\*.cs" />
<Compile Include="..\..\shared\Microsoft.Extensions.Buffers.Testing.Sources\**\*.cs" />
<Compile Include="..\..\shared\Microsoft.Extensions.ClosedGenericMatcher.Sources\**\*.cs" />
<Compile Include="..\..\shared\Microsoft.Extensions.CopyOnWriteDictionary.Sources\**\*.cs" />
Expand Down