revert last commit change (run global setup regardless of Jitting)

alinasmirnova · Sep 22, 2018 · eab4a33 · eab4a33
1 parent 06b30fe
commit eab4a33
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/src/BenchmarkDotNet.Core/Engines/Engine.cs b/src/BenchmarkDotNet.Core/Engines/Engine.cs
@@ -90,18 +90,13 @@ public void PreAllocate()
 
         public void Jitting()
         {
-            GlobalSetupAction?.Invoke();
-            IterationSetupAction?.Invoke();
-
             // first signal about jitting is raised from auto-generated Program.cs, look at BenchmarkProgram.txt
             Dummy1Action.Invoke();
             MainAction.Invoke(1);
             Dummy2Action.Invoke();
             IdleAction.Invoke(1);
             Dummy3Action.Invoke();
             isJitted = true;
-
-            IterationCleanupAction?.Invoke();
         }
 
         public RunResults Run()

diff --git a/src/BenchmarkDotNet.Core/Templates/BenchmarkProgram.txt b/src/BenchmarkDotNet.Core/Templates/BenchmarkProgram.txt
@@ -118,9 +118,14 @@ namespace BenchmarkDotNet.Autogenerated
 
             engine.PreAllocate();
 
+            instance?.globalSetupAction();
+            instance?.iterationSetupAction();
+
             if (job.ResolveValue(RunMode.RunStrategyCharacteristic, EngineResolver.Instance).NeedsJitting())
                 engine.Jitting(); // does first call to main action, must be executed after globalSetup() and iterationSetup()!
 
+            instance?.iterationCleanupAction();
+
             var results = engine.Run();
 
             instance?.globalCleanupAction();

diff --git a/src/BenchmarkDotNet.Core/Toolchains/DotNetCli/DotNetCliCommandExecutor.cs b/src/BenchmarkDotNet.Core/Toolchains/DotNetCli/DotNetCliCommandExecutor.cs
@@ -85,18 +85,17 @@ internal static string GetDotNetSdkVersion()
             }
         }
 
-        internal static ProcessStartInfo BuildStartInfo(string customDotNetCliPath, string workingDirectory, string arguments)
-        {
-            return new ProcessStartInfo
+        internal static ProcessStartInfo BuildStartInfo(string customDotNetCliPath, string workingDirectory, string arguments, bool redirectStandardInput = false) 
+            => new ProcessStartInfo
             {
                 FileName = customDotNetCliPath ?? "dotnet",
                 WorkingDirectory = workingDirectory,
                 Arguments = arguments,
                 UseShellExecute = false,
                 CreateNoWindow = true,
                 RedirectStandardOutput = true,
-                RedirectStandardError = true
+                RedirectStandardError = true,
+                RedirectStandardInput = redirectStandardInput
             };
-        }
     }
 }
diff --git a/src/BenchmarkDotNet.Core/Toolchains/DotNetCli/DotNetCliExecutor.cs b/src/BenchmarkDotNet.Core/Toolchains/DotNetCli/DotNetCliExecutor.cs
@@ -59,7 +59,8 @@ private ExecuteResult Execute(Benchmark benchmark, ILogger logger, ArtifactsPath
             var startInfo = DotNetCliCommandExecutor.BuildStartInfo(
                 CustomDotNetCliPath,
                 artifactsPaths.BinariesDirectoryPath,
-                BuildArgs(diagnoser, executableName));
+                BuildArgs(diagnoser, executableName),
+                redirectStandardInput: true);
 
             startInfo.SetEnvironmentVariables(benchmark, resolver);
 

diff --git a/src/BenchmarkDotNet.Core/Toolchains/InProcess/InProcessRunner.cs b/src/BenchmarkDotNet.Core/Toolchains/InProcess/InProcessRunner.cs
@@ -94,9 +94,14 @@ public static void RunCore(IHost host, Benchmark benchmark, BenchmarkActionCodeg
 
                 engine.PreAllocate();
 
+                globalSetupAction.InvokeSingle();
+                iterationSetupAction.InvokeSingle();
+
                 if (job.ResolveValue(RunMode.RunStrategyCharacteristic, EngineResolver.Instance).NeedsJitting())
                     engine.Jitting(); // does first call to main action, must be executed after setup()!
 
+                iterationCleanupAction.InvokeSingle();
+
                 var results = engine.Run();
 
                 globalCleanupAction.InvokeSingle();