Keep an fsi process ready for when we need it

1tgr · Nov 17, 2012 · efc2d57 · efc2d57
1 parent 95125ed
commit efc2d57
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 30 deletions.
diff --git a/Tim.TryFSharp.Service/app.fs b/Tim.TryFSharp.Service/app.fs
@@ -14,6 +14,7 @@ type App =
         BaseUri : Uri
         OwnSessions : Map<string, string * FsiProcess>
         SlowStop : bool
+        NextInteractiveProcess : Process
     }
 
 type Command =
@@ -101,15 +102,18 @@ module App =
                                 Recycle = fun () -> inbox.Post (Recycle id)
                             }
 
-                        let proc = new FsiProcess(info)
+                        let proc = new FsiProcess(info, app.NextInteractiveProcess)
+                        let app = { app with NextInteractiveProcess = FsiProcess.Start() }
+
                         let session =
                             { session with
                                 FsiPid = Some (int64 proc.Process.Id)
                                 Started = Some DateTime.Now
                             }
 
                         let rev = TryFSharpDB.putSession app.BaseUri id session
-                        { app with OwnSessions = Map.add id (Option.get rev.Rev, proc) app.OwnSessions }, OwnSession proc
+                        let app = { app with OwnSessions = Map.add id (Option.get rev.Rev, proc) app.OwnSessions }
+                        app, OwnSession proc
                     with ex ->
                         CouchDB.deleteDocument app.BaseUri id (Option.get rev.Rev)
                         app, ProcessFailed ex

diff --git a/Tim.TryFSharp.Service/fsiProcess.fs b/Tim.TryFSharp.Service/fsiProcess.fs
@@ -17,7 +17,7 @@ type FsiProcessInfo =
         Recycle : unit -> unit
     }
 
-type FsiProcess(info : FsiProcessInfo) =
+type FsiProcess(info : FsiProcessInfo, proc : Process) =
     let path = Path.Combine(Path.GetTempPath(), info.Name)
 
     let initTexts =
@@ -30,23 +30,6 @@ type FsiProcess(info : FsiProcessInfo) =
 
             Path.ChangeExtension(name, ".fsx"), text |]
 
-    let proc =
-        let fileName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Tim.TryFSharp.Interactive.exe")
-
-        let fileName, arguments =
-            match Type.GetType("Mono.Runtime") with
-            | null -> fileName, [ ]
-            | _ -> "mono", [ fileName ]
-
-        new Process(
-            StartInfo = ProcessStartInfo(
-                FileName = fileName,
-                WorkingDirectory = path,
-                RedirectStandardError = true,
-                RedirectStandardInput = true,
-                RedirectStandardOutput = true,
-                UseShellExecute = false))
-
     let syncRoot = obj()
     let buffer = ResizeArray<string>()
 
@@ -84,18 +67,16 @@ type FsiProcess(info : FsiProcessInfo) =
         proc.ErrorDataReceived.Add post
 
         ignore (Directory.CreateDirectory path)
-        for name, text in initTexts do
-            File.WriteAllText(Path.Combine(path, name), text)
-
-        ignore (proc.Start())
 
         let arguments =
             [|
                 yield sprintf "-I:%s" (Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "assemblies"))
                 yield! info.Arguments
 
-                for name, _ in initTexts do
-                    yield sprintf "--use:%s" name
+                for name, text in initTexts do
+                    let filename = Path.Combine(path, name)
+                    File.WriteAllText(filename, text)
+                    yield sprintf "--use:%s" filename
             |]
 
         let argumentsJson =
@@ -110,6 +91,26 @@ type FsiProcess(info : FsiProcessInfo) =
         proc.BeginErrorReadLine()
         proc.BeginOutputReadLine()
 
+    static member Start() : Process =
+        let fileName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Tim.TryFSharp.Interactive.exe")
+
+        let fileName, arguments =
+            match Type.GetType("Mono.Runtime") with
+            | null -> fileName, [ ]
+            | _ -> "mono", [ fileName ]
+
+        let proc =
+            new Process(
+                StartInfo = ProcessStartInfo(
+                    FileName = fileName,
+                    RedirectStandardError = true,
+                    RedirectStandardInput = true,
+                    RedirectStandardOutput = true,
+                    UseShellExecute = false))
+
+        ignore (proc.Start())
+        proc
+
     member this.Process = proc
 
     interface IDisposable with

diff --git a/Tim.TryFSharp.Service/service.fs b/Tim.TryFSharp.Service/service.fs
@@ -183,6 +183,7 @@ type ServiceState =
                     BaseUri = config.BaseUri
                     OwnSessions = Map.empty
                     SlowStop = false
+                    NextInteractiveProcess = FsiProcess.Start()
                 }
 
             MailboxProcessor.Start(App.run app, cts.Token)

diff --git a/Tim.TryFSharp.Test/serviceTests.fs b/Tim.TryFSharp.Test/serviceTests.fs
@@ -10,7 +10,8 @@ type ServiceTests() =
 
     [<Fact>]
     let ``Should start and stop fsi`` () =
-        use proc = new FsiProcess({ Name = Path.GetRandomFileName(); InitTexts = [| |]; Arguments = [| |]; Print = Console.WriteLine; Recycle = id })
+        use proc = FsiProcess.Start()
+        use fsiProc = new FsiProcess({ Name = Path.GetRandomFileName(); InitTexts = [| |]; Arguments = [| |]; Print = Console.WriteLine; Recycle = id }, proc)
         ()
 
     [<Fact>]
@@ -25,8 +26,9 @@ type ServiceTests() =
                 ignore (gotMessage.Set())
 
         let success =
-            using (new FsiProcess({ Name = Path.GetRandomFileName(); InitTexts = [| |]; Arguments = [| |]; Print = print; Recycle = id })) <| fun fsi ->
-                fsi.Process.StandardInput.WriteLine("printfn \"{0}\";;", message)
-                gotMessage.WaitOne(TimeSpan.FromSeconds(30.0))
+            use proc = FsiProcess.Start()
+            use fsiProc = new FsiProcess({ Name = Path.GetRandomFileName(); InitTexts = [| |]; Arguments = [| |]; Print = print; Recycle = id }, proc)
+            fsiProc.Process.StandardInput.WriteLine("printfn \"{0}\";;", message)
+            gotMessage.WaitOne(TimeSpan.FromSeconds(30.0))
 
         Assert.True(success, sprintf "Should have '%s' in: %A" message (lines.ToArray()))