Use server GC mode for compiler

closes dotnet#414 closes dotnet#404 commit 7583a2d60eb968fec2d4ab00a046682eef3f9a19 Author: latkin <[email protected]> Date: Tue May 5 10:18:12 2015 -0700 Add comment on use of <gcConcurrent>, and enable for tests commit d5de019 Author: latkin <[email protected]> Date: Mon May 4 11:39:31 2015 -0700 Setting server GC mode for compiler
latkin · May 5, 2015 · cf653b1 · cf653b1
1 parent 8b249d8
commit cf653b1
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/src/fsharp/Fsc-proto/Fsc-proto.fsproj b/src/fsharp/Fsc-proto/Fsc-proto.fsproj
@@ -26,6 +26,10 @@
     <Compile Include="..\fscmain.fs">
       <Link>fscmain.fs</Link>
     </Compile>
+    <None Include="fsc-proto.exe.config">
+      <Link>fsc-proto.exe.config</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="mscorlib" />

diff --git a/src/fsharp/Fsc-proto/fsc-proto.exe.config b/src/fsharp/Fsc-proto/fsc-proto.exe.config
@@ -1,23 +1,11 @@
 <configuration>
-
-  <!-- 
-  <startup>       
-    <supportedRuntime version="v2.0" />
-
-    <supportedRuntime version="v2.0.50727" />
-
-    <supportedRuntime version="v4.0.30319" />
-
-  </startup>  
--->
-
    <runtime>
+      <gcServer enabled="true"/>
       <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
          <dependentAssembly>
             <assemblyIdentity name="FSharp.Core" publicKeyToken="a19089b1c74d0809" culture="neutral" />
             <codeBase version="{LkgVersion}" href="FSharp.Core\FSharp.Core.dll"/>
          </dependentAssembly>
       </assemblyBinding>
    </runtime>
-
 </configuration>
diff --git a/src/fsharp/Fsc/fsc.exe.config b/src/fsharp/Fsc/fsc.exe.config
@@ -2,6 +2,7 @@
 <configuration>
   <runtime>
     <legacyUnhandledExceptionPolicy enabled="true" />
+    <gcServer enabled="true"/>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity

diff --git a/src/fsharp/fsc.fs b/src/fsharp/fsc.fs
@@ -2149,6 +2149,8 @@ let typecheckAndCompile(argv,bannerAlreadyPrinted,exiter:Exiter, errorLoggerProv
     |> main4
 
 let mainCompile (argv,bannerAlreadyPrinted,exiter:Exiter) = 
+    // Enabling batch latency mode currently overrides app config <gcConcurrent>.
+    // If batch mode is ever removed or changed, revisit use of <gcConcurrent>.
     System.Runtime.GCSettings.LatencyMode <- System.Runtime.GCLatencyMode.Batch
     typecheckAndCompile(argv, bannerAlreadyPrinted, exiter, DefaultLoggerProvider())
 

diff --git a/tests/fsharpqa/testenv/src/HostedCompilerServer/App.config b/tests/fsharpqa/testenv/src/HostedCompilerServer/App.config
@@ -3,4 +3,8 @@
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
     </startup>
+    <runtime>
+        <gcServer enabled="true"/>
+        <gcConcurrent enabled="false"/>
+    </runtime>
 </configuration>