Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 07:15:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1462784 - Merge GC and CC categories into one category. r=njn

Browse Source 
They're very similar as far as most users of the profiler are concerned, I'd
say, and I don't believe it's worth giving them two different colors in the
activity graphs.

MozReview-Commit-ID: HTqjp56naL3

--HG--
extra : rebase_source : cf8d64bc3e76ed9bb07100081aebfc404845b8bc
This commit is contained in:
Markus Stange 2018-05-18 17:23:33 -04:00
parent b085be8aeb
commit 973f0de3fa
5 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/base/nsDOMWindowUtils.cpp
View File

@ -1239,7 +1239,7 @@ nsDOMWindowUtils::GetWidgetForElement(Element* aElement)
NS_IMETHODIMP
nsDOMWindowUtils::GarbageCollect(nsICycleCollectorListener *aListener)
{
AUTO_PROFILER_LABEL("nsDOMWindowUtils::GarbageCollect", GC);
AUTO_PROFILER_LABEL("nsDOMWindowUtils::GarbageCollect", GCCC);
nsJSContext::GarbageCollectNow(JS::gcreason::DOM_UTILS);
nsJSContext::CycleCollectNow(aListener);

10
dom/base/nsJSEnvironment.cpp
View File

@ -1178,7 +1178,7 @@ nsJSContext::GarbageCollectNow(JS::gcreason::Reason aReason,
IsShrinking aShrinking,
int64_t aSliceMillis)
{
AUTO_PROFILER_LABEL_DYNAMIC_CSTR("nsJSContext::GarbageCollectNow", GC,
AUTO_PROFILER_LABEL_DYNAMIC_CSTR("nsJSContext::GarbageCollectNow", GCCC,
JS::gcreason::ExplainReason(aReason));
MOZ_ASSERT_IF(aSliceMillis, aIncremental == IncrementalGC);
@ -1231,7 +1231,7 @@ nsJSContext::GarbageCollectNow(JS::gcreason::Reason aReason,
static void
FinishAnyIncrementalGC()
{
AUTO_PROFILER_LABEL("FinishAnyIncrementalGC", GC);
AUTO_PROFILER_LABEL("FinishAnyIncrementalGC", GCCC);
if (sCCLockedOut) {
AutoJSAPI jsapi;
@ -1482,7 +1482,7 @@ nsJSContext::CycleCollectNow(nsICycleCollectorListener *aListener)
return;
}
AUTO_PROFILER_LABEL("nsJSContext::CycleCollectNow", CC);
AUTO_PROFILER_LABEL("nsJSContext::CycleCollectNow", GCCC);
gCCStats.PrepareForCycleCollectionSlice(TimeStamp());
nsCycleCollector_collect(aListener);
@ -1499,7 +1499,7 @@ nsJSContext::RunCycleCollectorSlice(TimeStamp aDeadline)
AUTO_PROFILER_TRACING("CC", aDeadline.IsNull() ? "CCSlice" : "IdleCCSlice");
AUTO_PROFILER_LABEL("nsJSContext::RunCycleCollectorSlice", CC);
AUTO_PROFILER_LABEL("nsJSContext::RunCycleCollectorSlice", GCCC);
gCCStats.PrepareForCycleCollectionSlice(aDeadline);
@ -1557,7 +1557,7 @@ nsJSContext::RunCycleCollectorWorkSlice(int64_t aWorkBudget)
return;
}
AUTO_PROFILER_LABEL("nsJSContext::RunCycleCollectorWorkSlice", CC);
AUTO_PROFILER_LABEL("nsJSContext::RunCycleCollectorWorkSlice", GCCC);
gCCStats.PrepareForCycleCollectionSlice();

3
js/public/ProfilingStack.h
View File

@ -193,8 +193,7 @@ class ProfilingStackFrame
OTHER,
CSS,
JS,
GC,
CC,
GCCC,
NETWORK,
GRAPHICS,
STORAGE,

2
js/src/gc/GC.cpp
View File

@ -6823,7 +6823,7 @@ AutoTraceSession::AutoTraceSession(JSRuntime* rt, JS::HeapState heapState)
: runtime(rt),
prevState(rt->mainContextFromOwnThread()->heapState),
profilingStackFrame(rt->mainContextFromOwnThread(), HeapStateToLabel(heapState),
ProfilingStackFrame::Category::GC)
ProfilingStackFrame::Category::GCCC)
{
MOZ_ASSERT(prevState == JS::HeapState::Idle);
MOZ_ASSERT(heapState != JS::HeapState::Idle);

8
xpcom/base/nsCycleCollector.cpp
View File

@ -4262,7 +4262,7 @@ nsCycleCollector_forgetSkippable(js::SliceBudget& aBudget,
MOZ_ASSERT(data);
MOZ_ASSERT(data->mCollector);
AUTO_PROFILER_LABEL("nsCycleCollector_forgetSkippable", CC);
AUTO_PROFILER_LABEL("nsCycleCollector_forgetSkippable", GCCC);
TimeLog timeLog;
data->mCollector->ForgetSkippable(aBudget,
@ -4309,7 +4309,7 @@ nsCycleCollector_collect(nsICycleCollectorListener* aManualListener)
MOZ_ASSERT(data);
MOZ_ASSERT(data->mCollector);
AUTO_PROFILER_LABEL("nsCycleCollector_collect", CC);
AUTO_PROFILER_LABEL("nsCycleCollector_collect", GCCC);
SliceBudget unlimitedBudget = SliceBudget::unlimited();
data->mCollector->Collect(ManualCC, unlimitedBudget, aManualListener);
@ -4325,7 +4325,7 @@ nsCycleCollector_collectSlice(SliceBudget& budget,
MOZ_ASSERT(data);
MOZ_ASSERT(data->mCollector);
AUTO_PROFILER_LABEL("nsCycleCollector_collectSlice", CC);
AUTO_PROFILER_LABEL("nsCycleCollector_collectSlice", GCCC);
data->mCollector->Collect(SliceCC, budget, nullptr, aPreferShorterSlices);
}
@ -4365,7 +4365,7 @@ nsCycleCollector_shutdown(bool aDoCollect)
if (data) {
MOZ_ASSERT(data->mCollector);
AUTO_PROFILER_LABEL("nsCycleCollector_shutdown", CC);
AUTO_PROFILER_LABEL("nsCycleCollector_shutdown", OTHER);
if (gMainThreadCollector == data->mCollector) {
gMainThreadCollector = nullptr;