Merge branch 'lukebakken/string-types-2' into stringallocations

Author: lukebakken

projects/Benchmarks/ConsumerDispatching/AsyncBasicConsumerFake.cs

@@ -18,7 +18,8 @@ public AsyncBasicConsumerFake(ManualResetEventSlim autoResetEvent)
             _autoResetEvent = autoResetEvent;
         }
 
-        public Task HandleBasicDeliver(string consumerTag, ulong deliveryTag, bool redelivered, ReadOnlyMemory<byte> exchange, ReadOnlyMemory<byte> routingKey,
+        public Task HandleBasicDeliver(ConsumerTag consumerTag, ulong deliveryTag, bool redelivered,
+            ExchangeName exchange, RoutingKey routingKey,
             in ReadOnlyBasicProperties properties, ReadOnlyMemory<byte> body)
         {
             if (Interlocked.Increment(ref _current) == Count)
@@ -29,7 +30,8 @@ public Task HandleBasicDeliver(string consumerTag, ulong deliveryTag, bool redel
             return Task.CompletedTask;
         }
 
-        Task IBasicConsumer.HandleBasicDeliverAsync(string consumerTag, ulong deliveryTag, bool redelivered, ReadOnlyMemory<byte> exchange, ReadOnlyMemory<byte> routingKey,
+        Task IBasicConsumer.HandleBasicDeliverAsync(ConsumerTag consumerTag, ulong deliveryTag, bool redelivered,
+            ExchangeName exchange, RoutingKey routingKey,
             ReadOnlyBasicProperties properties, ReadOnlyMemory<byte> body)
         {
             if (Interlocked.Increment(ref _current) == Count)
@@ -40,11 +42,11 @@ Task IBasicConsumer.HandleBasicDeliverAsync(string consumerTag, ulong deliveryTa
             return Task.CompletedTask;
         }
 
-        public Task HandleBasicCancel(string consumerTag) => Task.CompletedTask;
+        public Task HandleBasicCancel(ConsumerTag consumerTag) => Task.CompletedTask;
 
-        public Task HandleBasicCancelOk(string consumerTag) => Task.CompletedTask;
+        public Task HandleBasicCancelOk(ConsumerTag consumerTag) => Task.CompletedTask;
 
-        public Task HandleBasicConsumeOk(string consumerTag) => Task.CompletedTask;
+        public Task HandleBasicConsumeOk(ConsumerTag consumerTag) => Task.CompletedTask;
 
         public Task HandleChannelShutdown(object channel, ShutdownEventArgs reason) => Task.CompletedTask;
 
@@ -62,19 +64,19 @@ public event AsyncEventHandler<ConsumerEventArgs> ConsumerCancelled
             remove { }
         }
 
-        void IBasicConsumer.HandleBasicCancelOk(string consumerTag)
+        void IBasicConsumer.HandleBasicCancelOk(ConsumerTag consumerTag)
         {
         }
 
-        void IBasicConsumer.HandleBasicConsumeOk(string consumerTag)
+        void IBasicConsumer.HandleBasicConsumeOk(ConsumerTag consumerTag)
         {
         }
 
         void IBasicConsumer.HandleChannelShutdown(object channel, ShutdownEventArgs reason)
         {
         }
 
-        void IBasicConsumer.HandleBasicCancel(string consumerTag)
+        void IBasicConsumer.HandleBasicCancel(ConsumerTag consumerTag)
         {
         }
     }

projects/Benchmarks/ConsumerDispatching/ConsumerDispatcher.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
@@ -16,11 +15,12 @@ public class ConsumerDispatcherBase
 
         private protected IConsumerDispatcher _dispatcher;
         private protected readonly AsyncBasicConsumerFake _consumer = new AsyncBasicConsumerFake(_autoResetEvent);
-        protected readonly string _consumerTag = "ConsumerTag";
-        protected static readonly byte[] _consumerTagBytes = Encoding.UTF8.GetBytes("ConsumerTag");
+
+        protected static readonly ConsumerTag _consumerTag = new ConsumerTag("ConsumerTag");
+        protected static readonly ExchangeName _exchange = new ExchangeName("Exchange");
+        protected static readonly RoutingKey _routingKey = new RoutingKey("RoutingKey");
+
         protected readonly ulong _deliveryTag = 500UL;
-        protected static readonly byte[] _exchange = Encoding.UTF8.GetBytes("Exchange");
-        protected static readonly byte[] _routingKey = Encoding.UTF8.GetBytes("RoutingKey");
         protected readonly ReadOnlyBasicProperties _properties = new ReadOnlyBasicProperties();
         protected readonly byte[] _method = new byte[512];
         protected readonly byte[] _body = new byte[512];
@@ -51,12 +51,15 @@ public async Task SetUpAsyncConsumer()
         [Benchmark]
         public async Task AsyncConsumerDispatcher()
         {
+            var m = new MethodBasicDeliver();
+            m.SetUp();
+            using (RentedMemory method = new RentedMemory(m.Buffer.ToArray()))
             using (RentedMemory body = new RentedMemory(_body))
             {
                 for (int i = 0; i < Count; i++)
                 {
-                    await _dispatcher.HandleBasicDeliverAsync(_consumerTagBytes, _deliveryTag,
-                        false, _exchange, _routingKey, _properties, body, CancellationToken.None);
+                    await _dispatcher.HandleBasicDeliverAsync(_deliveryTag,
+                        false, _properties, method, body, CancellationToken.None);
                 }
                 _autoResetEvent.Wait();
                 _autoResetEvent.Reset();
@@ -74,12 +77,15 @@ public async Task SetUpConsumer()
         [Benchmark]
         public async Task ConsumerDispatcher()
         {
+            var m = new MethodBasicDeliver();
+            m.SetUp();
+            using (RentedMemory method = new RentedMemory(m.Buffer.ToArray()))
             using (RentedMemory body = new RentedMemory(_body))
             {
                 for (int i = 0; i < Count; i++)
                 {
-                    await _dispatcher.HandleBasicDeliverAsync(_consumerTagBytes, _deliveryTag,
-                        false, _exchange, _routingKey, _properties, body, CancellationToken.None);
+                    await _dispatcher.HandleBasicDeliverAsync(_deliveryTag,
+                        false, _properties, method, body, CancellationToken.None);
                 }
                 _autoResetEvent.Wait();
                 _autoResetEvent.Reset();

projects/Benchmarks/Networking/Networking_BasicDeliver_Commons.cs

@@ -28,7 +28,7 @@ public static async Task Publish_Hello_World(IConnection connection, uint messag
 
                 for (int i = 0; i < messageCount; i++)
                 {
-                    await channel.BasicPublishAsync("", queue.QueueName, body);
+                    await channel.BasicPublishAsync(ExchangeName.Empty, queue.QueueName, body);
                 }
 
                 await tcs.Task;

projects/Benchmarks/WireFormatting/MethodSerialization.cs

@@ -11,7 +11,7 @@ namespace RabbitMQ.Benchmarks
     [BenchmarkCategory("Methods")]
     public class MethodSerializationBase
     {
-        protected readonly Memory<byte> _buffer = new byte[1024];
+        public readonly Memory<byte> Buffer = new byte[1024];
 
         [GlobalSetup]
         public virtual void SetUp() { }
@@ -20,13 +20,13 @@ public virtual void SetUp() { }
     public class MethodBasicAck : MethodSerializationBase
     {
         private readonly BasicAck _basicAck = new BasicAck(ulong.MaxValue, true);
-        public override void SetUp() => _basicAck.WriteTo(_buffer.Span);
+        public override void SetUp() => _basicAck.WriteTo(Buffer.Span);
 
         [Benchmark]
-        public ulong BasicAckRead() => new BasicAck(_buffer.Span)._deliveryTag; // return one property to not box when returning an object instead
+        public ulong BasicAckRead() => new BasicAck(Buffer.Span)._deliveryTag; // return one property to not box when returning an object instead
 
         [Benchmark]
-        public int BasicAckWrite() => _basicAck.WriteTo(_buffer.Span);
+        public int BasicAckWrite() => _basicAck.WriteTo(Buffer.Span);
     }
 
     public class MethodBasicDeliver : MethodSerializationBase
@@ -37,21 +37,21 @@ public class MethodBasicDeliver : MethodSerializationBase
 
         public override void SetUp()
         {
-            int offset = Client.Impl.WireFormatting.WriteShortstr(ref _buffer.Span.GetStart(), string.Empty);
-            offset += Client.Impl.WireFormatting.WriteLonglong(ref _buffer.Span.GetOffset(offset), 0);
-            offset += Client.Impl.WireFormatting.WriteBits(ref _buffer.Span.GetOffset(offset), false);
-            offset += Client.Impl.WireFormatting.WriteShortstr(ref _buffer.Span.GetOffset(offset), string.Empty);
-            Client.Impl.WireFormatting.WriteShortstr(ref _buffer.Span.GetOffset(offset), string.Empty);
+            int offset = Client.Impl.WireFormatting.WriteShortstr(ref Buffer.Span.GetStart(), string.Empty);
+            offset += Client.Impl.WireFormatting.WriteLonglong(ref Buffer.Span.GetOffset(offset), 0);
+            offset += Client.Impl.WireFormatting.WriteBits(ref Buffer.Span.GetOffset(offset), false);
+            offset += Client.Impl.WireFormatting.WriteShortstr(ref Buffer.Span.GetOffset(offset), string.Empty);
+            Client.Impl.WireFormatting.WriteShortstr(ref Buffer.Span.GetOffset(offset), string.Empty);
         }
 
         [Benchmark]
-        public object BasicDeliverRead() => new BasicDeliver(_buffer)._consumerTag; // return one property to not box when returning an object instead
+        public object BasicDeliverRead() => new BasicDeliver(Buffer)._consumerTag; // return one property to not box when returning an object instead
 
         [Benchmark]
-        public int BasicPublishWrite() => _basicPublish.WriteTo(_buffer.Span);
+        public int BasicPublishWrite() => _basicPublish.WriteTo(Buffer.Span);
 
         [Benchmark]
-        public int BasicPublishMemoryWrite() => _basicPublishMemory.WriteTo(_buffer.Span);
+        public int BasicPublishMemoryWrite() => _basicPublishMemory.WriteTo(Buffer.Span);
 
         [Benchmark]
         public int BasicPublishSize() => _basicPublish.GetRequiredBufferSize();
@@ -64,25 +64,25 @@ public class MethodChannelClose : MethodSerializationBase
     {
         private readonly ChannelClose _channelClose = new ChannelClose(333, string.Empty, 0099, 2999);
 
-        public override void SetUp() => _channelClose.WriteTo(_buffer.Span);
+        public override void SetUp() => _channelClose.WriteTo(Buffer.Span);
 
         [Benchmark]
-        public object ChannelCloseRead() => new ChannelClose(_buffer.Span)._replyText; // return one property to not box when returning an object instead
+        public object ChannelCloseRead() => new ChannelClose(Buffer.Span)._replyText; // return one property to not box when returning an object instead
 
         [Benchmark]
-        public int ChannelCloseWrite() => _channelClose.WriteTo(_buffer.Span);
+        public int ChannelCloseWrite() => _channelClose.WriteTo(Buffer.Span);
     }
 
     public class MethodBasicProperties : MethodSerializationBase
     {
         private readonly IAmqpWriteable _basicProperties = new BasicProperties { Persistent = true, AppId = "AppId", ContentEncoding = "content", };
-        public override void SetUp() => _basicProperties.WriteTo(_buffer.Span);
+        public override void SetUp() => _basicProperties.WriteTo(Buffer.Span);
 
         [Benchmark]
-        public ReadOnlyBasicProperties BasicPropertiesRead() => new ReadOnlyBasicProperties(_buffer.Span);
+        public ReadOnlyBasicProperties BasicPropertiesRead() => new ReadOnlyBasicProperties(Buffer.Span);
 
         [Benchmark]
-        public int BasicPropertiesWrite() => _basicProperties.WriteTo(_buffer.Span);
+        public int BasicPropertiesWrite() => _basicProperties.WriteTo(Buffer.Span);
 
         [Benchmark]
         public int BasicDeliverSize() => _basicProperties.GetRequiredBufferSize();