NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commit25abff1

committed

Always use mono-sgen for /resident background process

This ensures mono-sgen is used even if fsc.exe is invoked by xbuild.Aso add tracing diagnostics to /resident startup

1 parentada4cc0 commit25abff1Copy full SHA for 25abff1

File tree

1 file changed

+10

-8

lines changed

src/fsharp
- fscmain.fs

1 file changed

+10

-8

lines changed

`‎src/fsharp/fscmain.fs‎`

Lines changed: 10 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -170,8 +170,13 @@ module FSharpResidentCompiler =`
`170`	`170`	`:?> FSharpCompilationServer`
`171`	`171`
`172`	`172`	`static memberTryCompileUsingServer(fscServerExe,argv)=`
	`173`	`+// Enable these lines to write a log file, e.g. when running under xbuild`
	`174`	`+//let os = System.IO.File.CreateText "/tmp/fsc-client-log"`
	`175`	`+//let printfn fmt = Printf.kfprintf (fun () -> fprintfn os ""; os.Flush()) os fmt`
	`176`	`+ progress:=!progress\|\| condition"FSHARP_SERVER_PROGRESS"`
`173`	`177`	`letpwd= System.Environment.CurrentDirectory`
`174`	`178`	`letclientOpt=`
	`179`	`+if!progressthen printfn"client: creating client"`
`175`	`180`	`// Detect the absence of the channel via the exception. Probably not the best way.`
`176`	`181`	`// Different exceptions get thrown here on Mono and Windows.`
`177`	`182`	`letclient= FSharpCompilationServer.ConnectToServer()`
`@@ -181,23 +186,19 @@ module FSharpResidentCompiler =`
`181`	`186`	`if!progressthen printfn"client: connected to existing service"`
`182`	`187`	`Some client`
`183`	`188`	`with_->`
	`189`	`+if!progressthen printfn"client: error while creating client, starting client instead"`
`184`	`190`	`letprocInfo=`
`185`	`191`	`if runningOnMonothen`
`186`	`192`	`letshellName,useShellExecute=`
`187`	`193`	`match System.Environment.GetEnvironmentVariable("FSC_MONO")with`
`188`	`194`	`\|null->`
`189`	`195`	`if onWindowsthen`
	`196`	`+// e.g. "C:\Program Files\Mono-2.6.1\lib\mono\2.0\mscorlib.dll" --> "C:\Program Files\Mono-2.6.1\bin\mono.exe"`
`190`	`197`	`Path.Combine(Path.GetDirectoryName(typeof<Object>.Assembly.Location),@"..\..\..\bin\mono.exe"),false`
`191`	`198`	`else`
`192`		`-// create some garbage`
`193`		`-for iin0..1000do[0.. i]\|> ignore`
`194`		`-// test if we're using mono-sgen`
`195`		`-letnotUsingMonoSGEN=(System.GC.CollectionCount(0)= System.GC.CollectionCount(1))`
`196`		`-lettarget=if notUsingMonoSGENthen"mono"else"mono-sgen"`
`197`		`- target,true`
`198`		`-\| path-> path,false`
	`199`	`+"mono-sgen",true`
	`200`	`+\| path-> path,true`
`199`	`201`
`200`		`-// e.g. "C:\Program Files\Mono-2.6.1\lib\mono20\mscorlib.dll" --> "C:\Program Files\Mono-2.6.1\bin\mono.exe"`
`201`	`202`	`ProcessStartInfo(FileName= shellName,`
`202`	`203`	`Arguments= fscServerExe+" /server",`
`203`	`204`	`CreateNoWindow=true,`
`@@ -218,6 +219,7 @@ module FSharpResidentCompiler =`
`218`	`219`
`219`	`220`	`// Create the client proxy and attempt to connect to the server`
`220`	`221`	`let rectryAcccesServer nRemaining=`
	`222`	`+if!progressthen printfn"client: trying to access server, nRemaining = '%d'" nRemaining`
`221`	`223`	`if nRemaining=0then`
`222`	`224`	`// Failed to connect to server, give up`
`223`	`225`	`None`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit25abff1

File tree

1 file changed

1 file changed

`‎src/fsharp/fscmain.fs‎`

0 commit comments