☠☠ backed out by 265931fd5e5a ☠ ☠ | |
author | Nicholas Nethercote <nnethercote@mozilla.com> |
Wed, 19 Apr 2017 14:47:18 +1000 | |
changeset 354581 | 8375b7a4be084a1be30a90c7a6df089f8b1682e0 |
parent 354580 | 97af1ab68078271b2817d5686fbd6f344b47fc14 |
child 354582 | 9baa76979a717579ad43a9814d0fed9c73717b5a |
push id | 31707 |
push user | kwierso@gmail.com |
push date | Mon, 24 Apr 2017 22:53:41 +0000 |
treeherder | mozilla-central@abdcc8dfc283 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | mstange |
bugs | 1358074 |
milestone | 55.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
|
--- a/tools/profiler/core/platform.cpp +++ b/tools/profiler/core/platform.cpp @@ -1379,33 +1379,33 @@ locked_profiler_stream_json_for_this_pro aWriter.EndObject(); } // Lists the samples for each thread profile aWriter.StartArrayProperty("threads"); { gPS->SetIsPaused(aLock, true); - const PS::ThreadVector& liveThreads = gPS->LiveThreads(aLock); - for (size_t i = 0; i < liveThreads.size(); i++) { - ThreadInfo* info = liveThreads.at(i); - if (!info->IsBeingProfiled()) { - continue; - } - info->StreamJSON(gPS->Buffer(aLock), aWriter, gPS->StartTime(aLock), - aSinceTime); + const PS::ThreadVector& liveThreads = gPS->LiveThreads(aLock); + for (size_t i = 0; i < liveThreads.size(); i++) { + ThreadInfo* info = liveThreads.at(i); + if (!info->IsBeingProfiled()) { + continue; } - - const PS::ThreadVector& deadThreads = gPS->DeadThreads(aLock); - for (size_t i = 0; i < deadThreads.size(); i++) { - ThreadInfo* info = deadThreads.at(i); - MOZ_ASSERT(info->IsBeingProfiled()); - info->StreamJSON(gPS->Buffer(aLock), aWriter, gPS->StartTime(aLock), - aSinceTime); - } + info->StreamJSON(gPS->Buffer(aLock), aWriter, gPS->StartTime(aLock), + aSinceTime); + } + + const PS::ThreadVector& deadThreads = gPS->DeadThreads(aLock); + for (size_t i = 0; i < deadThreads.size(); i++) { + ThreadInfo* info = deadThreads.at(i); + MOZ_ASSERT(info->IsBeingProfiled()); + info->StreamJSON(gPS->Buffer(aLock), aWriter, gPS->StartTime(aLock), + aSinceTime); + } #if defined(PROFILE_JAVA) if (gPS->FeatureJava(aLock)) { java::GeckoJavaSampler::Pause(); aWriter.Start(); { BuildJavaThreadJSObject(aWriter);