From 1cf5ee39f35628ab8e66935378e80ae6084679ce Mon Sep 17 00:00:00 2001
From: Googler <noreply@google.com>
Date: Tue, 31 Jul 2018 07:34:51 -0700
Subject: Get newlines back. After the switch to using a JsonWriter, the json
 profile output was written all in one line. However, it is really convenient
 to be able to grep and count over the file (or generally be able to open it
 in an editor).

This change is a bit hacky as just using setIndent makes the file completely
expanded with one key-value pair per line, which is also not ideal. With this
change, the format is:

[
  { <entry> },
  { <entry> },
  ...
  { <entry> }
]

RELNOTES: None
PiperOrigin-RevId: 206758496
---
 src/main/java/com/google/devtools/build/lib/profiler/Profiler.java | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/main')

diff --git a/src/main/java/com/google/devtools/build/lib/profiler/Profiler.java b/src/main/java/com/google/devtools/build/lib/profiler/Profiler.java
index 2d475f2624..712e9b5ddb 100644
--- a/src/main/java/com/google/devtools/build/lib/profiler/Profiler.java
+++ b/src/main/java/com/google/devtools/build/lib/profiler/Profiler.java
@@ -1046,7 +1046,9 @@ public final class Profiler {
               continue;
             }
             if (data.type == ProfilerTask.THREAD_NAME) {
+              writer.setIndent("  ");
               writer.beginObject();
+              writer.setIndent("");
               writer.name("name").value("thread_name");
               writer.name("ph").value("M");
               writer.name("pid").value(1);
@@ -1061,7 +1063,9 @@ public final class Profiler {
               continue;
             }
             String eventType = data.duration == 0 ? "i" : "X";
+            writer.setIndent("  ");
             writer.beginObject();
+            writer.setIndent("");
             writer.name("cat").value(data.type.description);
             writer.name("name").value(data.description);
             writer.name("ph").value(eventType);
@@ -1075,6 +1079,7 @@ public final class Profiler {
             writer.endObject();
           }
           receivedPoisonPill = true;
+          writer.setIndent("  ");
           writer.endArray();
         } catch (IOException e) {
           this.savedException = e;
-- 
cgit v1.2.3