Skip to content

Commit 79ec342

Browse files
SimonCroppAarononthewebArkatufus
authored
move ByteBuffer alias to a global using (#7681)
Co-authored-by: Aaron Stannard <[email protected]> Co-authored-by: Gregorius Soedharmo <[email protected]>
1 parent f1962c6 commit 79ec342

File tree

13 files changed

+13
-22
lines changed

13 files changed

+13
-22
lines changed

src/core/Akka/GlobalUsings.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// -----------------------------------------------------------------------
2+
// <copyright file="GlobalUsings.cs" company="Akka.NET Project">
3+
// Copyright (C) 2009-2022 Lightbend Inc. <http://www.lightbend.com>
4+
// Copyright (C) 2013-2025 .NET Foundation <https://github.com/akkadotnet/akka.net>
5+
// </copyright>
6+
// -----------------------------------------------------------------------
7+
8+
global using ByteBuffer = System.ArraySegment<byte>;

src/core/Akka/IO/Buffers/DirectBufferPool.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717

1818
namespace Akka.IO.Buffers
1919
{
20-
using ByteBuffer = ArraySegment<byte>;
21-
2220
public class BufferPoolAllocationException : AkkaException
2321
{
2422
public BufferPoolAllocationException(string message) : base(message)
@@ -68,8 +66,8 @@ public interface IBufferPool
6866

6967
/// <summary>
7068
/// Rents a sequence of byte buffers representing (potentially non-continuous) range of memory
71-
/// that is big enough to fit the <paramref name="minimumSize"/> requested. Once rent, byte
72-
/// buffers are expected to be released using <see cref="Release(System.ArraySegment{byte})"/>
69+
/// that is big enough to fit the <paramref name="minimumSize"/> requested. Once rent, byte
70+
/// buffers are expected to be released using <see cref="Release(ByteBuffer)"/>
7371
/// method.
7472
/// </summary>
7573
/// <param name="minimumSize">

src/core/Akka/IO/Buffers/DisabledBufferPool.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212

1313
namespace Akka.IO.Buffers
1414
{
15-
using ByteBuffer = ArraySegment<byte>;
16-
1715
internal class DisabledBufferPool : IBufferPool
1816
{
1917
private readonly int _bufferSize;

src/core/Akka/IO/SocketEventArgsPool.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public void Release(SocketAsyncEventArgs e)
6565
{
6666
if (e.Buffer != null)
6767
{
68-
_bufferPool.Release(new ArraySegment<byte>(e.Buffer, e.Offset, e.Count));
68+
_bufferPool.Release(new ByteBuffer(e.Buffer, e.Offset, e.Count));
6969
}
7070
if (e.BufferList != null)
7171
{

src/core/Akka/IO/TcpConnection.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
namespace Akka.IO
2323
{
2424
using static Akka.IO.Tcp;
25-
using ByteBuffer = ArraySegment<byte>;
2625

2726
// A **green‑field** rewrite of the connection actor, distilled to
2827
// • 4 stable phases (Connecting ▸ AwaitRegistration ▸ Open ▸ HalfOpen)
@@ -559,7 +558,7 @@ private void TrySend()
559558
if (!_state.CanSend) return;
560559
if (_state.IsSending || _pendingWrites.Count == 0) return;
561560

562-
var segs = new List<ArraySegment<byte>>(8);
561+
var segs = new List<ByteBuffer>(8);
563562
var batchBytes = 0;
564563

565564
while (_pendingWrites.Count > 0 && batchBytes < Settings.MaxFrameSizeBytes)

src/core/Akka/IO/TcpManager.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Akka.IO
1313
{
1414
using static Tcp;
15-
using ByteBuffer = ArraySegment<byte>;
1615

1716
/// <summary>
1817
/// INTERNAL API

src/core/Akka/IO/Udp.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
namespace Akka.IO
2020
{
21-
using ByteBuffer = ArraySegment<byte>;
22-
2321
/// <summary>
2422
/// UDP Extension for Akka's IO layer.
2523
///

src/core/Akka/IO/UdpConnected.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
namespace Akka.IO
2020
{
21-
using ByteBuffer = ArraySegment<byte>;
22-
2321
/// <summary>
2422
/// UDP Extension for Akka's IO layer.
2523
///

src/core/Akka/IO/UdpConnectedManager.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111

1212
namespace Akka.IO
1313
{
14-
using ByteBuffer = ArraySegment<byte>;
15-
1614
/// <summary>
1715
/// INTERNAL API
1816
/// </summary>

src/core/Akka/IO/UdpConnection.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
namespace Akka.IO
1818
{
1919
using static UdpConnected;
20-
using ByteBuffer = ArraySegment<byte>;
2120

2221
internal class UdpConnection : ActorBase, IRequiresMessageQueue<IUnboundedMessageQueueSemantics>
2322
{

0 commit comments

Comments
 (0)