Do not call MemoryStream.ToArray during write of OutboundFrame

Author: yupliner

projects/client/RabbitMQ.Client/src/client/impl/ExtensionMethods.cs

@@ -40,6 +40,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 
 namespace RabbitMQ.Client.Impl
@@ -63,5 +64,16 @@ public static T RandomItem<T>(this IList<T> list)
             var hashCode = Math.Abs(Guid.NewGuid().GetHashCode());
             return list.ElementAt<T>(hashCode % n);
         }
+
+        public static ArraySegment<byte> GetBufferSegment(this MemoryStream ms)
+        {
+#if CORECLR15
+            var payload = ms.ToArray();
+            return new ArraySegment<byte>(payload, 0, payload.Length);
+#else
+            var buffer = ms.GetBuffer();
+            return new ArraySegment<byte>(buffer, 0, (int)ms.Position);
+#endif
+        }
     }
 }

projects/client/RabbitMQ.Client/src/client/impl/Frame.cs

@@ -73,15 +73,9 @@ public override void WritePayload(NetworkBinaryWriter writer)
             nw.Write(header.ProtocolClassId);
             header.WriteTo(nw, (ulong)bodyLength);
 
-#if CORECLR15
-            var payload = ms.ToArray();
-            writer.Write((uint)payload.Length);
-            writer.Write(payload);
-#else
-            var buffer = ms.GetBuffer();
-            writer.Write((uint)ms.Position);
-            writer.Write(buffer, 0, (int)ms.Position);
-#endif
+            var bufferSegment = ms.GetBufferSegment();
+            writer.Write((uint)bufferSegment.Count);
+            writer.Write(bufferSegment.Array, bufferSegment.Offset, bufferSegment.Count);
         }
     }
 
@@ -126,15 +120,9 @@ public override void WritePayload(NetworkBinaryWriter writer)
             method.WriteArgumentsTo(argWriter);
             argWriter.Flush();
 
-#if CORECLR15
-            var payload = ms.ToArray();
-            writer.Write((uint)payload.Length);
-            writer.Write(payload);
-#else
-            var buffer = ms.GetBuffer();
-            writer.Write((uint)ms.Position);
-            writer.Write(buffer, 0, (int)ms.Position);
-#endif
+            var bufferSegment = ms.GetBufferSegment();
+            writer.Write((uint)bufferSegment.Count);
+            writer.Write(bufferSegment.Array, bufferSegment.Offset, bufferSegment.Count);
         }
     }
 

projects/client/RabbitMQ.Client/src/client/impl/SocketFrameHandler.cs

@@ -222,7 +222,7 @@ public void SendHeader()
                 nbw.Write((byte)Endpoint.Protocol.MajorVersion);
                 nbw.Write((byte)Endpoint.Protocol.MinorVersion);
             }
-            Write(ms.ToArray());
+            Write(ms.GetBufferSegment());
         }
 
         public void WriteFrame(OutboundFrame frame)
@@ -231,7 +231,7 @@ public void WriteFrame(OutboundFrame frame)
             var nbw = new NetworkBinaryWriter(ms);
             frame.WriteTo(nbw);
             m_socket.Client.Poll(m_writeableStateTimeout, SelectMode.SelectWrite);
-            Write(ms.ToArray());
+            Write(ms.GetBufferSegment());
         }
 
         public void WriteFrameSet(IList<OutboundFrame> frames)
@@ -240,21 +240,21 @@ public void WriteFrameSet(IList<OutboundFrame> frames)
             var nbw = new NetworkBinaryWriter(ms);
             foreach (var f in frames) f.WriteTo(nbw);
             m_socket.Client.Poll(m_writeableStateTimeout, SelectMode.SelectWrite);
-            Write(ms.ToArray());
+            Write(ms.GetBufferSegment());
         }
 
-        private void Write(byte [] buffer)
+        private void Write(ArraySegment<byte> bufferSegment)
         {
             if(_ssl)
             {
                 lock (_sslStreamLock)
                 {
-                    m_writer.Write(buffer);
+                    m_writer.Write(bufferSegment.Array, bufferSegment.Offset, bufferSegment.Count);
                 }
             }
             else
             {
-                m_writer.Write(buffer);
+                m_writer.Write(bufferSegment.Array, bufferSegment.Offset, bufferSegment.Count);
             }
         }