Early testhost startup performance work

src/Microsoft.TestPlatform.Client/DesignMode/DesignModeClient.cs

@@ -27,6 +27,7 @@ namespace Microsoft.VisualStudio.TestPlatform.Client.DesignMode
     using CommunicationUtilitiesResources = Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources;
     using CoreUtilitiesConstants = Microsoft.VisualStudio.TestPlatform.CoreUtilities.Constants;
     using ObjectModelConstants = Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants;
+    using Microsoft.VisualStudio.TestPlatform.Client.StartTestRunner;
 
     /// <summary>
     /// The design mode client.
@@ -151,6 +152,15 @@ private void ProcessRequests(ITestRequestManager testRequestManager)
                 {
                     var message = this.communicationManager.ReceiveMessage();
 
+                    /*if (!System.Diagnostics.Debugger.IsAttached)
+                    {
+                        System.Diagnostics.Debugger.Launch();
+                    }
+                    else
+                    {
+                        System.Diagnostics.Debugger.Break();
+                    }*/
+
                     if (EqtTrace.IsInfoEnabled)
                     {
                         EqtTrace.Info("DesignModeClient.ProcessRequests: Processing Message: {0}", message);
@@ -177,7 +187,7 @@ private void ProcessRequests(ITestRequestManager testRequestManager)
                         case MessageType.StartTestRunner:
                             {
                                 var testRunnerPayload = this.communicationManager.DeserializePayload<StartTestRunnerPayload>(message);
-                                this.StartTestRunner(testRunnerPayload);
+                                this.StartTestRunner(testRunnerPayload, testRequestManager);
                                 break;
                             }
 
@@ -365,24 +375,6 @@ public bool AttachDebuggerToProcess(int pid, CancellationToken cancellationToken
             }
         }
 
-        /// <inheritdoc/>
-        public void StartTestRunner(StartTestRunnerPayload payload)
-        {
-            // Here we do the work of initializing the runner.
-            this.SendTestRunnerId(-1);
-        }
-
-        /// <inheritdoc/>
-        public void SendTestRunnerId(int pid)
-        {
-            if (this.protocolConfig.Version < ObjectModelConstants.MinimumProtocolVersionWithTestRunnerStartSupport)
-            {
-                return;
-            }
-
-            this.communicationManager.SendMessage(MessageType.StartTestRunnerCallback, pid);
-        }
-
         /// <summary>
         /// Send the raw messages to IDE
         /// </summary>
@@ -526,6 +518,48 @@ private void StartTestRunAttachmentsProcessing(TestRunAttachmentsProcessingPaylo
                 });
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="payload"></param>
+        /// <param name="testRequestManager"></param>
+        private void StartTestRunner(StartTestRunnerPayload payload, ITestRequestManager testRequestManager)
+        {
+            Task.Run(
+                delegate
+                {
+                    var eventsHandler = new StartTestRunnerEventsHandler(this.communicationManager);
+
+                    try
+                    {
+                        testRequestManager.ResetOptions();
+                        testRequestManager.StartTestRunner(payload, eventsHandler, this.protocolConfig);
+                    }
+                    catch (Exception ex)
+                    {
+                        EqtTrace.Error("DesignModeClient: Exception in StartTestRunner: " + ex);
+
+                        // TODO: Better signal the error.
+                        eventsHandler.HandleStartTestRunnerComplete(null);
+
+                        /*var testMessagePayload = new TestMessagePayload { MessageLevel = TestMessageLevel.Error, Message = ex.ToString() };
+                        this.communicationManager.SendMessage(MessageType.TestMessage, testMessagePayload);
+
+                        var payload = new DiscoveryCompletePayload()
+                        {
+                            IsAborted = true,
+                            LastDiscoveredTests = null,
+                            TotalTests = -1
+                        };
+
+                        // Send run complete to translation layer
+                        this.communicationManager.SendMessage(MessageType.DiscoveryComplete, payload);*/
+                    }
+                });
+
+            // Here we do the work of initializing the runner.
+        }
+
         #region IDisposable Support
 
         private bool disposedValue = false; // To detect redundant calls

src/Microsoft.TestPlatform.Client/DesignMode/IDesignModeClient.cs

@@ -37,10 +37,6 @@ public interface IDesignModeClient : IDisposable
         /// <returns><see cref="true"/> if the debugger was successfully attached to the requested process, <see cref="false"/> otherwise.</returns>
         bool AttachDebuggerToProcess(int pid, CancellationToken cancellationToken);
 
-        void StartTestRunner(StartTestRunnerPayload payload);
-
-        void SendTestRunnerId(int pid);
-
         /// <summary>
         /// Handles parent process exit
         /// </summary>

src/Microsoft.TestPlatform.Client/RequestHelper/ITestRequestManager.cs

@@ -5,10 +5,11 @@ namespace Microsoft.VisualStudio.TestPlatform.Client.RequestHelper
 {
     using System;
     using System.Collections.Generic;
-
+    using Microsoft.VisualStudio.TestPlatform.Client.StartTestRunner;
     using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads;
 
     /// <summary>
     /// Defines the contract that command line
@@ -51,6 +52,14 @@ public interface ITestRequestManager : IDisposable
         /// <param name="testRunAttachmentsProcessingEventsHandler">Test run attachments processing events handler</param>
         void ProcessTestRunAttachments(TestRunAttachmentsProcessingPayload testRunAttachmentsProcessingPayload, ITestRunAttachmentsProcessingEventsHandler testRunAttachmentsProcessingEventsHandler, ProtocolConfig protocolConfig);
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="payload"></param>
+        /// <param name="eventsHandler"></param>
+        /// <param name="protocolConfig"></param>
+        void StartTestRunner(StartTestRunnerPayload payload, IStartTestRunnerEventsHandler eventsHandler, ProtocolConfig protocolConfig);
+
         /// <summary>
         /// Cancel the current TestRun request
         /// </summary>

src/Microsoft.TestPlatform.Client/StartTestRunner/StartTestRunnerEventsHandler.cs

@@ -0,0 +1,51 @@
+// 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.Client.StartTestRunner
+{
+    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads;
+    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public class StartTestRunnerEventsHandler : IStartTestRunnerEventsHandler
+    {
+        private readonly ICommunicationManager communicationManager;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="communicationManager"></param>
+        public StartTestRunnerEventsHandler(ICommunicationManager communicationManager)
+        {
+            this.communicationManager = communicationManager;
+        }
+
+        /// <inheritdoc />
+        public void HandleStartTestRunnerComplete(Session session)
+        {
+            var ackPayload = new StartTestRunnerAckPayload()
+            {
+                Session = session
+            };
+
+            this.communicationManager.SendMessage(MessageType.StartTestRunnerCallback, ackPayload);
+        }
+
+        /// <inheritdoc />
+        public void HandleLogMessage(TestMessageLevel level, string message)
+        {
+            // No-op.
+        }
+
+        /// <inheritdoc />
+        public void HandleRawMessage(string rawMessage)
+        {
+            // No-op.
+        }
+    }
+}

src/Microsoft.TestPlatform.Client/TestPlatform.cs

@@ -15,6 +15,7 @@ namespace Microsoft.VisualStudio.TestPlatform.Client
     using Microsoft.VisualStudio.TestPlatform.Common;
     using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
     using Microsoft.VisualStudio.TestPlatform.Common.Hosting;
+    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces.Engine.TesthostProtocol;
     using Microsoft.VisualStudio.TestPlatform.Common.Logging;
     using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
     using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine;
@@ -31,7 +32,7 @@ namespace Microsoft.VisualStudio.TestPlatform.Client
     /// <summary>
     /// Implementation for TestPlatform
     /// </summary>
-    internal class TestPlatform : ITestPlatform
+    public class TestPlatform : ITestPlatform
     {
         private readonly TestRuntimeProviderManager testHostProviderManager;
 
@@ -71,6 +72,14 @@ protected TestPlatform(ITestEngine testEngine, IFileHelper filehelper, TestRunti
             this.testHostProviderManager = testHostProviderManager;
         }
 
+        public TestRuntimeProviderManager TestHostProviderManager
+        {
+            get
+            {
+                return this.testHostProviderManager;
+            }
+        }
+
         /// <summary>
         /// Gets or sets Test Engine instance
         /// </summary>
@@ -161,6 +170,35 @@ public ITestRunRequest CreateTestRunRequest(IRequestData requestData, TestRunCri
             return new TestRunRequest(requestData, testRunCriteria, executionManager, loggerManager);
         }
 
+        public void CreateStartTestRunnerRequest(IRequestData requestData, StartTestRunnerCriteria startTestRunnerCriteria, IStartTestRunnerEventsHandler eventsHandler)
+        {
+            if (startTestRunnerCriteria == null)
+            {
+                throw new ArgumentNullException(nameof(startTestRunnerCriteria));
+            }
+
+            // Initialize loggers
+            var loggerManager = this.TestEngine.GetLoggerManager(requestData);
+            loggerManager.Initialize(startTestRunnerCriteria.RunSettings);
+
+            var testHostManager = this.testHostProviderManager.GetTestHostManagerByRunConfiguration(startTestRunnerCriteria.RunSettings);
+            ThrowExceptionIfTestHostManagerIsNull(testHostManager, startTestRunnerCriteria.RunSettings);
+
+            testHostManager.Initialize(TestSessionMessageLogger.Instance, startTestRunnerCriteria.RunSettings);
+
+            if (startTestRunnerCriteria.TestHostLauncher != null)
+            {
+                testHostManager.SetCustomLauncher(startTestRunnerCriteria.TestHostLauncher);
+            }
+
+            var startTestRunnerManager = this.TestEngine.GetStartTestRunnerManager(requestData, testHostManager, startTestRunnerCriteria);
+
+            // TODO: What should happen on initialization ?
+            startTestRunnerManager.Initialize(false);
+
+            startTestRunnerManager.StartTestRunner(startTestRunnerCriteria, eventsHandler);
+        }
+
         /// <summary>
         /// The dispose.
         /// </summary>

src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/ITestEngine.cs

@@ -3,6 +3,7 @@
 
 namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine
 {
+    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces.Engine.TesthostProtocol;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
 
@@ -31,6 +32,8 @@ public interface ITestEngine
         /// <returns>ITestExecutionManager object that can do execution</returns>
         IProxyExecutionManager GetExecutionManager(IRequestData requestData, ITestRuntimeProvider testHostManager, TestRunCriteria testRunCriteria);
 
+        IProxyStartTestRunnerManager GetStartTestRunnerManager(IRequestData requestData, ITestRuntimeProvider testHostManager, StartTestRunnerCriteria testRunCriteria);
+
         /// <summary>
         /// Fetches the extension manager for this engine. This manager would provide extensibility
         /// features that this engine supports.

src/Microsoft.TestPlatform.Common/Interfaces/Engine/TesthostProtocol/IProxyStartTestRunnerManager.cs

@@ -0,0 +1,36 @@
+// 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.Common.Interfaces.Engine.TesthostProtocol
+{
+    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public interface IProxyStartTestRunnerManager
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="skipDefaultAdapters"></param>
+        void Initialize(bool skipDefaultAdapters);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="criteria"></param>
+        /// <param name="eventsHandler"></param>
+        void StartTestRunner(StartTestRunnerCriteria criteria, IStartTestRunnerEventsHandler eventsHandler);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        void Abort();
+
+        /// <summary>
+        /// 
+        /// </summary>
+        void Close();
+    }
+}

src/Microsoft.TestPlatform.Common/Telemetry/TelemetryDataConstants.cs

@@ -68,6 +68,8 @@ public static class TelemetryDataConstants
 
         public static string ParallelEnabledDuringDiscovery = "VS.TestDiscovery.ParallelEnabled";
 
+        public static string ParallelEnabledDuringStartTestRunner = "VS.StartTestRunner.ParallelEnabled";
+
         // All the times are in sec
         public static string TimeTakenInSecForDiscovery = "VS.TestDiscovery.TotalTimeTakenInSec";
 
@@ -104,5 +106,7 @@ public static class TelemetryDataConstants
         public static string TestExecutionCompleteEvent = "vs/testplatform/testrunsession";
 
         public static string TestAttachmentsProcessingCompleteEvent = "vs/testplatform/testattachmentsprocessingsession";
+
+        public static string StartTestRunnerCompleteEvent = "vs/testplatform/starttestrunnersession";
     }
 }

src/Microsoft.TestPlatform.CoreUtilities/Tracing/Interfaces/ITestPlatformEventSource.cs

@@ -218,5 +218,9 @@ public interface ITestPlatformEventSource
         /// Mark the completion of translation layer test run attachments processing request.
         /// </summary>
         void TranslationLayerTestRunAttachmentsProcessingStop();
+
+        void StartTestRunnerStart();
+
+        void StartTestRunnerStop();
     }
 }

src/Microsoft.TestPlatform.CoreUtilities/Tracing/TestPlatformEventSource.cs

@@ -279,5 +279,15 @@ public void TranslationLayerTestRunAttachmentsProcessingStop()
         {
             this.WriteEvent(TestPlatformInstrumentationEvents.TranslationLayerTestRunAttachmentsProcessingStopEventId);
         }
+
+        public void StartTestRunnerStart()
+        {
+            this.WriteEvent(TestPlatformInstrumentationEvents.StartTestRunnerStartEventId);
+        }
+
+        public void StartTestRunnerStop()
+        {
+            this.WriteEvent(TestPlatformInstrumentationEvents.StartTestRunnerStopEventId);
+        }
     }
 }

src/Microsoft.TestPlatform.CoreUtilities/Tracing/TestPlatformInstrumentationEvents.cs

@@ -187,5 +187,15 @@ internal class TestPlatformInstrumentationEvents
         /// Events fired on session attachments processing complete in translation layer.
         /// </summary>
         public const int TranslationLayerTestRunAttachmentsProcessingStopEventId = 0x45;
+
+        /// <summary>
+        /// The start test runner request start event id.
+        /// </summary>
+        public const int StartTestRunnerStartEventId = 0x46;
+
+        /// <summary>
+        /// The start test runner request stop event id.
+        /// </summary>
+        public const int StartTestRunnerStopEventId = 0x47;
     }
 }