Bug 1364161 - Emit a major GC marker for the end of a major GC, and a slice marker for the end of a slice, instead of the other way around, r=mstange

MozReview-Commit-ID: 337I7TeN8tQ

--HG--
extra : rebase_source : 68725645926fbf9662c45bf6fa13ba02c25d8894
This commit is contained in:
Steve Fink 2017-05-12 17:42:43 -07:00
parent 828107d250
commit 251223d923

View File

@ -833,15 +833,15 @@ CycleCollectedJSRuntime::GCSliceCallback(JSContext* aContext,
#ifdef MOZ_GECKO_PROFILER
if (profiler_is_active()) {
if (aProgress == JS::GC_CYCLE_END) {
auto payload = new GCSliceMarkerPayload(aDesc.lastSliceStart(aContext),
aDesc.lastSliceEnd(aContext),
aDesc.sliceToJSON(aContext));
PROFILER_MARKER_PAYLOAD("GCSlice", payload);
} else if (aProgress == JS::GC_SLICE_END) {
auto payload = new GCMajorMarkerPayload(aDesc.startTime(aContext),
aDesc.endTime(aContext),
aDesc.summaryToJSON(aContext));
PROFILER_MARKER_PAYLOAD("GCMajor", payload);
} else if (aProgress == JS::GC_SLICE_END) {
auto payload = new GCSliceMarkerPayload(aDesc.lastSliceStart(aContext),
aDesc.lastSliceEnd(aContext),
aDesc.sliceToJSON(aContext));
PROFILER_MARKER_PAYLOAD("GCSlice", payload);
}
}
#endif