fixed deadlock with stats

CClash/CClashServer.cs

@@ -222,7 +222,7 @@ public CClashResponse ProcessRequest(CClashRequest req)
                     rv.exitcode = 0;
                     cache.SetupStats(); // commits stats to disk
 
-                    rv.stdout = StatOutputs.GetStatsString(req.compiler);
+                    rv.stdout = StatOutputs.GetStatsString(req.compiler, cache);
                     break;
 
                 case Command.Run:

CClash/CClashServerClient.cs

@@ -35,9 +35,7 @@ void Connect()
 
             try
             {
-                if (!ncs.IsConnected)
-                    ncs.Connect(100);
-                ncs.ReadMode = PipeTransmissionMode.Message;
+                ConnectClient();
                 return;
             }
             catch (IOException ex)
@@ -50,8 +48,7 @@ void Connect()
             {
             }
 
-
-            // start the server, but lets not try to use it here, the next instance can
+            // start the server
             try {
 
                 var p = new Process();
@@ -63,12 +60,21 @@ void Connect()
                 p.StartInfo.WorkingDirectory = Environment.CurrentDirectory;
                 p.StartInfo.WindowStyle = ProcessWindowStyle.Hidden;
                 p.Start();
-                throw new CClashWarningException("starting new server");
+                System.Threading.Thread.Sleep(1000);
+                ConnectClient();
             } catch (Exception e) {
                 Logging.Emit("error starting cclash server process", e.Message);
+                throw new CClashErrorException("could not start/connect to server");
             }
         }
 
+        private void ConnectClient()
+        {
+            if (!ncs.IsConnected)
+                ncs.Connect(100);
+            ncs.ReadMode = PipeTransmissionMode.Message;
+        }
+
         public ICacheInfo Stats
         {
             get

CClash/Program.cs

@@ -70,7 +70,8 @@ public static int Main(string[] args)
                 var compiler = Compiler.Find();
                 if (Settings.ServiceMode)
                 {
-                    for (int i = 0; i < 3; i++ ) {
+                    for (int i = 0; i < 3; i++)
+                    {
                         try
                         {
                             var cc = new CClashServerClient(Settings.CacheDirectory);
@@ -84,6 +85,11 @@ public static int Main(string[] args)
                                 return 0;
                             }
                         }
+                        catch (CClashErrorException ex)
+                        {
+                            Logging.Error(ex.Message);
+                            return -1;
+                        }
                         catch (CClashWarningException)
                         {
                             System.Threading.Thread.Sleep(2000);
@@ -97,7 +103,12 @@ public static int Main(string[] args)
                 }
                 else
                 {
-                    Console.Out.WriteLine(StatOutputs.GetStatsString(compiler));
+                    using (ICompilerCache cc =
+                        CompilerCacheFactory.Get(Settings.DirectMode, Settings.CacheDirectory, compiler, Environment.CurrentDirectory, Compiler.GetEnvironmentDictionary()
+                        ))
+                    {
+                        Console.Out.WriteLine(StatOutputs.GetStatsString(compiler, cc));
+                    }
                 }
                 return 0;
             }

CClash/StatOutputs.cs

@@ -8,7 +8,7 @@ namespace CClash
 {
     public class StatOutputs
     {
-        public static string GetStatsString(string compiler)
+        public static string GetStatsString(string compiler, ICompilerCache cache)
         {
             var sb = new StringBuilder();
             sb.WriteLine("compiler: {0}", compiler);
@@ -27,7 +27,7 @@ public static string GetStatsString(string compiler)
             }
             if (compiler != null)
             {
-                using (var cache = new DirectCompilerCache(Settings.CacheDirectory))
+                if (cache != null)
                 {
                     var mseclost = cache.Stats.MSecLost;
                     var msecsaved = cache.Stats.MSecSaved;