Bug 1221846 - Properly close the tasktracer property in the GeckoSampler JSON blob. r=BenWa
authorMike Conley <mconley@mozilla.com>
Tue, 15 Dec 2015 19:12:17 -0500
changeset 278381 0e4bdac31c326ba2c22082469cdf9fb6626fe912
parent 278380 61cefe69917e39f70a8fde8e87ddf04755b4c6d4
child 278382 c315a91b6edb1ab48c71b6975cc4d12a7fe35185
push id29850
push usercbook@mozilla.com
push dateTue, 05 Jan 2016 10:59:10 +0000
treeherdermozilla-central@29258f59e545 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersBenWa
bugs1221846
milestone46.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 1221846 - Properly close the tasktracer property in the GeckoSampler JSON blob. r=BenWa
tools/profiler/core/GeckoSampler.cpp
--- a/tools/profiler/core/GeckoSampler.cpp
+++ b/tools/profiler/core/GeckoSampler.cpp
@@ -518,16 +518,17 @@ void GeckoSampler::StreamJSON(Spliceable
     aWriter.StartObjectProperty("meta");
       StreamMetaJSCustomObject(aWriter);
     aWriter.EndObject();
 
     // Data of TaskTracer doesn't belong in the circular buffer.
     if (TaskTracer()) {
       aWriter.StartObjectProperty("tasktracer");
       StreamTaskTracer(aWriter);
+      aWriter.EndObject();
     }
 
     // Lists the samples for each ThreadProfile
     aWriter.StartArrayProperty("threads");
     {
       SetPaused(true);
 
       {