(refs #7250) Merging master, minor CHR bugfixes

[simantics/platform.git] / bundles / org.simantics.scl.compiler / src / org / simantics / scl / compiler / compilation / CompilationTimer.java

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/CompilationTimer.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/CompilationTimer.java
index 0ad3627d89f5337ace03301b0d9e470eddcb4169..14e7d620b582109e93af20d3450044fb765424b8 100644 (file)
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/CompilationTimer.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/CompilationTimer.java
@@ -1,56 +1,56 @@
-package org.simantics.scl.compiler.compilation;\r
-\r
-import java.util.ArrayList;\r
-\r
-import gnu.trove.map.hash.TObjectLongHashMap;\r
-\r
-public class CompilationTimer {\r
-    private long initialTime, previousTime;\r
-    private ArrayList<TimerEntry> entries = new ArrayList<TimerEntry>();\r
-    private static TObjectLongHashMap<String> GLOBAL_TIMES = new TObjectLongHashMap<String>();\r
-    \r
-    private static class TimerEntry {\r
-        public final String phaseName;\r
-        public final long time;\r
-        public final long cumulativeTime;\r
-        \r
-        public TimerEntry(String phaseName, long time, long cumulativeTime) {\r
-            this.phaseName = phaseName;\r
-            this.time = time;\r
-            this.cumulativeTime = cumulativeTime;\r
-        }        \r
-    }\r
-    \r
-    public CompilationTimer() {\r
-        initialTime = previousTime = System.nanoTime();\r
-    }\r
-    \r
-    public void phaseFinished(String phaseName) {\r
-        long time = System.nanoTime();\r
-        entries.add(new TimerEntry(phaseName, time-previousTime, time-initialTime));\r
-        previousTime = time;\r
-    }\r
-    \r
-    public void suspendTimer() {\r
-        long time = System.nanoTime();\r
-        initialTime -= time;\r
-        previousTime -= time;\r
-    }\r
-    \r
-    public void continueTimer() {\r
-        long time = System.nanoTime();\r
-        initialTime += time;\r
-        previousTime += time;\r
-    }\r
-    \r
-    public void report(String moduleName) {\r
-        synchronized(GLOBAL_TIMES) {\r
-            System.out.println(moduleName);\r
-            for(TimerEntry entry : entries) {\r
-                long globalTime = GLOBAL_TIMES.adjustOrPutValue(entry.phaseName, entry.time, entry.time);\r
-                System.out.println("    " + entry.phaseName + " " + entry.time*1e-6 \r
-                        + "ms (cumulative: " + entry.cumulativeTime*1e-6 + "ms, global: " + globalTime*1e-6 + ")");\r
-            }\r
-        }\r
-    }\r
-}\r
+package org.simantics.scl.compiler.compilation;
+
+import java.util.ArrayList;
+
+import gnu.trove.map.hash.TObjectLongHashMap;
+
+public class CompilationTimer {
+    private long initialTime, previousTime;
+    private ArrayList<TimerEntry> entries = new ArrayList<TimerEntry>();
+    private static TObjectLongHashMap<String> GLOBAL_TIMES = new TObjectLongHashMap<String>();
+    
+    private static class TimerEntry {
+        public final String phaseName;
+        public final long time;
+        public final long cumulativeTime;
+        
+        public TimerEntry(String phaseName, long time, long cumulativeTime) {
+            this.phaseName = phaseName;
+            this.time = time;
+            this.cumulativeTime = cumulativeTime;
+        }        
+    }
+    
+    public CompilationTimer() {
+        initialTime = previousTime = System.nanoTime();
+    }
+    
+    public void phaseFinished(String phaseName) {
+        long time = System.nanoTime();
+        entries.add(new TimerEntry(phaseName, time-previousTime, time-initialTime));
+        previousTime = time;
+    }
+    
+    public void suspendTimer() {
+        long time = System.nanoTime();
+        initialTime -= time;
+        previousTime -= time;
+    }
+    
+    public void continueTimer() {
+        long time = System.nanoTime();
+        initialTime += time;
+        previousTime += time;
+    }
+    
+    public void report(String moduleName) {
+        synchronized(GLOBAL_TIMES) {
+            System.out.println(moduleName);
+            for(TimerEntry entry : entries) {
+                long globalTime = GLOBAL_TIMES.adjustOrPutValue(entry.phaseName, entry.time, entry.time);
+                System.out.println("    " + entry.phaseName + " " + entry.time*1e-6 
+                        + "ms (cumulative: " + entry.cumulativeTime*1e-6 + "ms, global: " + globalTime*1e-6 + ")");
+            }
+        }
+    }
+}