Bug 1169334 - Fix missing braces in Java thread profile; r=mstange
authorJim Chen <nchen@mozilla.com>
Tue, 02 Jun 2015 16:31:25 -0400
changeset 246853 9799293a428246904626f266a99723d725db5863
parent 246852 582fcb5a63d3ba0624968177b96de3ae27880d83
child 246854 ce85a3468e35a13106abcabd3b39e77feff75887
push id28843
push usercbook@mozilla.com
push dateWed, 03 Jun 2015 11:50:02 +0000
treeherdermozilla-central@6c612d7adbf5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmstange
bugs1169334
milestone41.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1169334 - Fix missing braces in Java thread profile; r=mstange
tools/profiler/TableTicker.cpp
--- a/tools/profiler/TableTicker.cpp
+++ b/tools/profiler/TableTicker.cpp
@@ -251,16 +251,17 @@ void SubProcessCallback(const char* aPro
   closure->mWriter->StringElement(aProfile);
 }
 
 
 #if defined(SPS_OS_android) && !defined(MOZ_WIDGET_GONK)
 static
 void BuildJavaThreadJSObject(SpliceableJSONWriter& aWriter)
 {
+  aWriter.Start(SpliceableJSONWriter::SingleLineStyle);
   aWriter.StringProperty("name", "Java Main Thread");
 
   aWriter.StartArrayProperty("samples");
 
     // for each sample
     for (int sampleId = 0; true; sampleId++) {
       bool firstRun = true;
       // for each frame
@@ -295,16 +296,17 @@ void BuildJavaThreadJSObject(SpliceableJ
       }
       // if we found no frames for this sample, we are done
       if (firstRun) {
         break;
       }
     }
 
   aWriter.EndArray();
+  aWriter.End();
 }
 #endif
 
 void TableTicker::StreamJSON(SpliceableJSONWriter& aWriter, float aSinceTime)
 {
   aWriter.Start(SpliceableJSONWriter::SingleLineStyle);
   {
     // Put shared library info