Using BufferedStream over NetworkStream for performance improvement.

src/Microsoft.TestPlatform.CommunicationUtilities/SocketClient.cs

@@ -11,6 +11,7 @@ namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities
     using System.Threading.Tasks;
     using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
     using Microsoft.VisualStudio.TestPlatform.Utilities;
 
     /// <summary>
@@ -35,7 +36,7 @@ protected SocketClient(Func<Stream, ICommunicationChannel> channelFactory)
             this.cancellation = new CancellationTokenSource();
             this.stopped = false;
 
-            this.tcpClient = new TcpClient();
+            this.tcpClient = new TcpClient { NoDelay = true };
             this.channelFactory = channelFactory;
         }
 
@@ -69,7 +70,7 @@ private void OnServerConnected(Task connectAsyncTask)
                 throw connectAsyncTask.Exception;
             }
 
-            this.channel = this.channelFactory(this.tcpClient.GetStream());
+            this.channel = this.channelFactory(new PlatformStream().PlatformBufferedStream(this.tcpClient.GetStream(), SocketConstants.BUFFERSIZE));
             if (this.ServerConnected != null)
             {
                 this.ServerConnected.SafeInvoke(this, new ConnectedEventArgs(this.channel), "SocketClient: ServerConnected");

src/Microsoft.TestPlatform.CommunicationUtilities/SocketCommunicationManager.cs

@@ -10,9 +10,9 @@ namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities
     using System.Net.Sockets;
     using System.Threading;
     using System.Threading.Tasks;
-
     using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
 
     /// <summary>
     /// Facilitates communication using sockets
@@ -73,7 +73,7 @@ public class SocketCommunicationManager : ICommunicationManager
         /// <summary>
         /// Stream to use read timeout
         /// </summary>
-        private NetworkStream stream;
+        private Stream stream;
 
         private Socket socket;
 
@@ -100,7 +100,6 @@ internal SocketCommunicationManager(IDataSerializer dataSerializer)
         public IPEndPoint HostServer(IPEndPoint endpoint)
         {
             this.tcpListener = new TcpListener(endpoint);
-
             this.tcpListener.Start();
             EqtTrace.Info("Listening on Endpoint : {0}", (IPEndPoint)this.tcpListener.LocalEndpoint);
 
@@ -119,12 +118,13 @@ public async Task AcceptClientAsync()
 
                 var client = await this.tcpListener.AcceptTcpClientAsync();
                 this.socket = client.Client;
-                this.stream = client.GetStream();
-                this.binaryReader = new BinaryReader(this.stream);
+                this.socket.NoDelay = true;
+                this.stream = new PlatformStream().PlatformBufferedStream(client.GetStream(), SocketConstants.BUFFERSIZE);
+                this.binaryReader = new BinaryReader(client.GetStream());
                 this.binaryWriter = new BinaryWriter(this.stream);
 
                 this.clientConnectedEvent.Set();
-
+                EqtTrace.Info("Using the buffer size of {0} bytes", SocketConstants.BUFFERSIZE);
                 EqtTrace.Info("Accepted Client request and set the flag");
             }
         }
@@ -165,7 +165,7 @@ public async Task SetupClientAsync(IPEndPoint endpoint)
             // for now added a check for validation of this.tcpclient
             this.clientConnectionAcceptedEvent.Reset();
             EqtTrace.Info("Trying to connect to server on socket : {0} ", endpoint);
-            this.tcpClient = new TcpClient();
+            this.tcpClient = new TcpClient { NoDelay = true };
             this.socket = this.tcpClient.Client;
 
             Stopwatch watch = new Stopwatch();
@@ -178,10 +178,11 @@ public async Task SetupClientAsync(IPEndPoint endpoint)
 
                     if (this.tcpClient.Connected)
                     {
-                        this.stream = this.tcpClient.GetStream();
-                        this.binaryReader = new BinaryReader(this.stream);
+                        this.stream = new PlatformStream().PlatformBufferedStream(this.tcpClient.GetStream(), SocketConstants.BUFFERSIZE);
+                        this.binaryReader = new BinaryReader(this.tcpClient.GetStream());
                         this.binaryWriter = new BinaryWriter(this.stream);
                         EqtTrace.Info("Connected to the server successfully ");
+                        EqtTrace.Info("Using the buffer size of {0} bytes", SocketConstants.BUFFERSIZE);
                         this.clientConnectionAcceptedEvent.Set();
                     }
                 }
@@ -354,8 +355,8 @@ private string TryReceiveRawMessage(CancellationToken cancellationToken)
                         && socketException.SocketErrorCode == SocketError.TimedOut)
                     {
                         EqtTrace.Info(
-                            "SocketCommunicationManager ReceiveMessage: failed to receive message because read timeout {0}",
-                            ioException);
+                        "SocketCommunicationManager ReceiveMessage: failed to receive message because read timeout {0}",
+                        ioException);
                     }
                     else
                     {

src/Microsoft.TestPlatform.CommunicationUtilities/SocketConstants.cs

@@ -0,0 +1,11 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities
+{
+    public class SocketConstants
+    {
+        // Buffer size for the buffered stream we are using.
+        public const int BUFFERSIZE = 16384;
+    }
+}

src/Microsoft.TestPlatform.CommunicationUtilities/SocketServer.cs

@@ -9,9 +9,9 @@ namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities
     using System.Net.Sockets;
     using System.Threading;
     using System.Threading.Tasks;
-
     using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
     using Microsoft.VisualStudio.TestPlatform.Utilities;
 
     /// <summary>
@@ -88,10 +88,11 @@ public void Stop()
         private void OnClientConnected(TcpClient client)
         {
             this.tcpClient = client;
+            this.tcpClient.Client.NoDelay = true;
 
             if (this.ClientConnected != null)
             {
-                this.channel = this.channelFactory(client.GetStream());
+                this.channel = this.channelFactory(new PlatformStream().PlatformBufferedStream(this.tcpClient.GetStream(), SocketConstants.BUFFERSIZE));
                 this.ClientConnected.SafeInvoke(this, new ConnectedEventArgs(this.channel), "SocketServer: ClientConnected");
 
                 // Start the message loop

src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/IStream.cs

@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces
+{
+    using System.IO;
+
+    /// <summary>
+    /// Helper class to return plaform specific stream.
+    /// </summary>
+    public interface IStream
+    {
+        /// <summary>
+        /// Returns plarform specific Buffered Stream
+        /// </summary>
+        /// <param name="stream">Input Stream</param>
+        /// <returns>Buffered Stream</returns>
+        Stream PlatformBufferedStream(Stream stream);
+
+        /// <summary>
+        /// Returns platrform specific Buffered Stream with desired buffer size.
+        /// </summary>
+        /// <param name="stream">Input Stream</param>
+        /// <param name="bufferSize">Buffer Size</param>
+        /// <returns>Buffered Stream</returns>
+        Stream PlatformBufferedStream(Stream stream, int bufferSize);
+    }
+}

src/Microsoft.TestPlatform.PlatformAbstractions/common/System/PlatformStream.cs

@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
+{
+    using System.IO;
+    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+
+    /// <inheritdoc/>
+    public class PlatformStream : IStream
+    {
+        public Stream PlatformBufferedStream(Stream stream)
+        {
+            return new BufferedStream(stream);
+        }
+
+        /// <inheritdoc/>
+        public Stream PlatformBufferedStream(Stream stream, int bufferSize)
+        {
+            return new BufferedStream(stream, bufferSize);
+        }
+    }
+}

src/Microsoft.TestPlatform.PlatformAbstractions/netstandard1.0/System/PlatformStream.cs

@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
+{
+    using System;
+    using System.IO;
+    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+
+    /// <inheritdoc/>
+    public class PlatformStream : IStream
+    {
+        public Stream PlatformBufferedStream(Stream stream)
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <inheritdoc/>
+        public Stream PlatformBufferedStream(Stream stream, int bufferSize)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

src/Microsoft.TestPlatform.PlatformAbstractions/uap10.0/System/PlatformStream.cs

@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
+{
+    using System.IO;
+    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+
+    /// <inheritdoc/>
+    public class PlatformStream : IStream
+    {
+        /// <inheritdoc/>
+        public Stream PlatformBufferedStream(Stream stream)
+        {
+            return stream;
+        }
+
+        /// <inheritdoc/>
+        public Stream PlatformBufferedStream(Stream stream, int bufferSize)
+        {
+            return stream;
+        }
+    }
+}

test/Microsoft.TestPlatform.PerformanceTests/SocketTests.cs

@@ -6,6 +6,8 @@ namespace Microsoft.TestPlatform.PerformanceTests
     using System;
     using System.Diagnostics;
     using System.Net;
+    using System.Collections.Generic;    
+    using System.Text;
     using System.Threading;
     using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
     using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;