WIP

Author: retronym

src/reflect/scala/reflect/internal/util/ChromeTrace.scala

@@ -5,6 +5,8 @@ import java.lang.management.ManagementFactory
 import java.nio.file.{Files, Path}
 import java.util.concurrent.TimeUnit
 
+import scala.collection.mutable
+
 object ChromeTrace {
 
   private object EventType {
@@ -27,24 +29,26 @@ object ChromeTrace {
 final class ChromeTrace(f: Path) extends Closeable {
   import ChromeTrace.EventType
   private val traceWriter = Files.newBufferedWriter(f)
+  private val context = mutable.ArrayStack[JsonContext](TopContext)
+
   objStart()
   fld("traceEvents")
+  context.push(ValueContext)
   arrStart()
   traceWriter.write("\n")
 
-  private val pid = ManagementFactory.getRuntimeMXBean().getName()
+  private val pid = ManagementFactory.getRuntimeMXBean().getName().replaceAll("@.*", "")
 
   override def close(): Unit = {
-    traceWriter.append("\n")
     arrEnd()
     objEnd()
+    context.pop()
     traceWriter.close()
   }
 
   def traceDurationEvent(name: String, startNanos: Long, durationNanos: Long, tid: String = this.tid()): Unit = {
     val durationMicros = nanosToMicros(durationNanos)
     val startMicros = nanosToMicros(startNanos)
-    commaIfFirst()
     objStart()
     str("cat", "scalac")
     str("name", name)
@@ -58,7 +62,6 @@ final class ChromeTrace(f: Path) extends Closeable {
   }
 
   def traceCounterEvent(name: String, counterName: String, count: Long): Unit = {
-    commaIfFirst()
     objStart()
     str("cat", "scalac")
     str("name", name)
@@ -78,7 +81,6 @@ final class ChromeTrace(f: Path) extends Closeable {
   def traceDurationEventEnd(name: String, colour: String = ""): Unit = traceAsyncEvent(EventType.Finished, name, colour)
 
   private def traceAsyncEvent(eventType: String, name: String, colour: String): Unit = {
-    commaIfFirst()
     objStart()
     str("cat", "scalac")
     str("name", name)
@@ -99,14 +101,15 @@ final class ChromeTrace(f: Path) extends Closeable {
 
   private def microTime(): Long = nanosToMicros(System.nanoTime())
 
-  private def commaIfFirst(): Unit = {
-    if (firstEvent) firstEvent = false else traceWriter.write(",")
-  }
-
-  private var firstEvent = true
+  sealed abstract class JsonContext
+  case class ArrayContext(var first: Boolean) extends JsonContext
+  case class ObjectContext(var first: Boolean) extends JsonContext
+  case object ValueContext extends JsonContext
+  case object TopContext extends JsonContext
 
   private def str(name: String, value: String): Unit = {
     fld(name)
+    traceWriter.write("\"")
     traceWriter.write(value) // This assumes no escaping is needed
     traceWriter.write("\"")
   }
@@ -115,15 +118,40 @@ final class ChromeTrace(f: Path) extends Closeable {
     traceWriter.write(String.valueOf(value))
     traceWriter.write("")
   }
-  private def objStart(): Unit = traceWriter.write("{")
-  private def objEnd(): Unit = traceWriter.write("}")
-  private def arrStart(): Unit = traceWriter.write("[")
-  private def arrEnd(): Unit = traceWriter.write("]")
+  private def objStart(): Unit = {
+    context.top match {
+      case ac @ ArrayContext(first) =>
+        if (first) ac.first = false
+        else traceWriter.write(",")
+      case _ =>
+    }
+    context.push(ObjectContext(true))
+    traceWriter.write("{")
+  }
+  private def objEnd(): Unit = {
+    traceWriter.write("}")
+    context.pop()
+  }
+  private def arrStart(): Unit = {
+    traceWriter.write("[")
+    context.push(ArrayContext(true))
+  }
+  private def arrEnd(): Unit = {
+    traceWriter.write("]")
+    context.pop()
+  }
 
   private def fld(name: String) = {
+    context.top match {
+      case oc @ ObjectContext(first) =>
+        if (first) oc.first = false
+        else traceWriter.write(",")
+      case context =>
+        throw new IllegalStateException("Wrong context: " + context)
+    }
     traceWriter.write("\"")
     traceWriter.write(name)
     traceWriter.write("\"")
-    traceWriter.write(": ")
+    traceWriter.write(":")
   }
 }