Make RunTransformsOnAllFunctions actually obey the threading setting.…

… Whoops. Write the elapsed translation time into the jsillog file.
iskiselev · Mar 7, 2013 · 43760d0 · 43760d0
1 parent bae5da8
commit 43760d0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/Compiler/Program.cs b/Compiler/Program.cs
@@ -559,6 +559,7 @@ IEnumerable<KeyValuePair<string, string[]>> ignoredMethods
             var logText = new StringBuilder();
             var asmName = Assembly.GetExecutingAssembly().GetName();
             logText.AppendLine(String.Format("// JSILc v{0}.{1}.{2}", asmName.Version.Major, asmName.Version.Minor, asmName.Version.Revision));
+            logText.AppendLine(String.Format("// Build took {0:0000.00} second(s).", outputs.Elapsed.TotalSeconds));
             logText.AppendLine(String.Format("// The following configuration was used when translating '{0}':", inputFile));
             logText.AppendLine((new JavaScriptSerializer()).Serialize(configuration));
             logText.AppendLine("// The configuration was generated from the following configuration files:");

diff --git a/JSIL/AssemblyTranslator.cs b/JSIL/AssemblyTranslator.cs
@@ -363,6 +363,8 @@ protected virtual string FormatOutputFilename (AssemblyNameDefinition assemblyNa
         public TranslationResult Translate (
             string assemblyPath, bool scanForProxies = true
         ) {
+            var sw = Stopwatch.StartNew();
+
             if (Configuration.RunBugChecks.GetValueOrDefault(true))
                 BugChecks.RunBugChecks();
             else
@@ -455,6 +457,8 @@ public TranslationResult Translate (
 
             pr.OnFinished();
 
+            sw.Stop();
+            result.Elapsed = sw.Elapsed;
             return result;
         }
 
@@ -567,7 +571,7 @@ protected void RunTransformsOnAllFunctions (ParallelOptions parallelOptions, Pro
                 if (Configuration.CodeGenerator.EnableThreadedTransforms.GetValueOrDefault(true)) {
                     Parallel.ForEach(
                         FunctionCache.PendingTransformsQueue.TryDequeueAll,
-                        itemHandler
+                        parallelOptions, itemHandler
                     );
                 } else {
                     QualifiedMemberIdentifier _id;

diff --git a/JSIL/TranslationResult.cs b/JSIL/TranslationResult.cs
@@ -20,6 +20,7 @@ public struct ResultFile {
         public readonly List<string> FileOrder = new List<string>();
         public readonly Dictionary<string, ResultFile> Files = new Dictionary<string, ResultFile>();
         public readonly StringBuilder Log = new StringBuilder();
+        public TimeSpan Elapsed;
         public ArraySegment<byte> Manifest;
 
         internal TranslationResult (Configuration configuration) {

diff --git a/build_corlib.bat b/build_corlib.bat
@@ -1 +1 @@
-bin\JSILc "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" "Corlib\corlib.jsilconfig"
+bin\JSILc "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" "Corlib\corlib.jsilconfig" %*
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		bin\JSILc "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" "Corlib\corlib.jsilconfig"
		bin\JSILc "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" "Corlib\corlib.jsilconfig" %*