зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1385296 - Improve JS_GC_PROFILE / MOZ_GCTIMER output r=sfink
This commit is contained in:
Jon Coppeard
Родитель
915c63c332
Коммит
69faf34f2b
|
|
@ -516,7 +516,7 @@ FOR_EACH_NURSERY_PROFILE_TIME(EXTRACT_NAME)
|
|||
/* static */ void
|
||||
js::Nursery::printProfileHeader()
|
||||
{
|
||||
fprintf(stderr, "MinorGC: Reason PRate Size ");
|
||||
fprintf(stderr, "MinorGC: Reason PRate Size ");
|
||||
#define PRINT_HEADER(name, text) \
|
||||
fprintf(stderr, " %6s", text);
|
||||
FOR_EACH_NURSERY_PROFILE_TIME(PRINT_HEADER)
|
||||
|
|
@ -536,7 +536,7 @@ void
|
|||
js::Nursery::printTotalProfileTimes()
|
||||
{
|
||||
if (enableProfiling_) {
|
||||
fprintf(stderr, "MinorGC TOTALS: %7" PRIu64 " collections: ", minorGcCount_);
|
||||
fprintf(stderr, "MinorGC TOTALS: %7" PRIu64 " collections: ", minorGcCount_);
|
||||
printProfileDurations(totalDurations_);
|
||||
}
|
||||
}
|
||||
|
|
@ -669,7 +669,7 @@ js::Nursery::collect(JS::gcreason::Reason reason)
|
|||
if (enableProfiling_ && totalTime >= profileThreshold_) {
|
||||
rt->gc.stats().maybePrintProfileHeaders();
|
||||
|
||||
fprintf(stderr, "MinorGC: %20s %5.1f%% %4u ",
|
||||
fprintf(stderr, "MinorGC: %20s %5.1f%% %4u ",
|
||||
JS::gcreason::ExplainReason(reason),
|
||||
promotionRate * 100,
|
||||
numChunks());
|
||||
|
|
|
|||
|
|
@ -462,6 +462,13 @@ Statistics::formatDetailedSliceDescription(unsigned i, const SliceData& slice) c
|
|||
return DuplicateString(buffer);
|
||||
}
|
||||
|
||||
static bool
|
||||
IncludePhase(TimeDuration duration)
|
||||
{
|
||||
// Don't include durations that will print as "0.000ms".
|
||||
return duration.ToMilliseconds() >= 0.001;
|
||||
}
|
||||
|
||||
UniqueChars
|
||||
Statistics::formatDetailedPhaseTimes(const PhaseTimeTable& phaseTimes) const
|
||||
{
|
||||
|
|
@ -473,15 +480,15 @@ Statistics::formatDetailedPhaseTimes(const PhaseTimeTable& phaseTimes) const
|
|||
uint8_t level = phases[phase].depth;
|
||||
TimeDuration ownTime = phaseTimes[phase];
|
||||
TimeDuration childTime = SumChildTimes(phase, phaseTimes);
|
||||
if (!ownTime.IsZero()) {
|
||||
SprintfLiteral(buffer, " %*s: %.3fms\n",
|
||||
level * 2, phases[phase].name, t(ownTime));
|
||||
if (IncludePhase(ownTime)) {
|
||||
SprintfLiteral(buffer, " %*s%s: %.3fms\n",
|
||||
level * 2, "", phases[phase].name, t(ownTime));
|
||||
if (!fragments.append(DuplicateString(buffer)))
|
||||
return UniqueChars(nullptr);
|
||||
|
||||
if (childTime && (ownTime - childTime) > MaxUnaccountedChildTime) {
|
||||
SprintfLiteral(buffer, " %*s: %.3fms\n",
|
||||
(level + 1) * 2, "Other", t(ownTime - childTime));
|
||||
SprintfLiteral(buffer, " %*s%s: %.3fms\n",
|
||||
(level + 1) * 2, "", "Other", t(ownTime - childTime));
|
||||
if (!fragments.append(DuplicateString(buffer)))
|
||||
return UniqueChars(nullptr);
|
||||
}
|
||||
|
|
@ -1298,12 +1305,8 @@ Statistics::maybePrintProfileHeaders()
|
|||
static int printedHeader = 0;
|
||||
if ((printedHeader++ % 200) == 0) {
|
||||
printProfileHeader();
|
||||
for (ZoneGroupsIter group(runtime); !group.done(); group.next()) {
|
||||
if (group->nursery().enableProfiling()) {
|
||||
Nursery::printProfileHeader();
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (runtime->gc.nursery().enableProfiling())
|
||||
Nursery::printProfileHeader();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1313,7 +1316,8 @@ Statistics::printProfileHeader()
|
|||
if (!enableProfiling_)
|
||||
return;
|
||||
|
||||
fprintf(stderr, "MajorGC: Reason States ");
|
||||
fprintf(stderr, "MajorGC: Reason States SRN ");
|
||||
fprintf(stderr, " %6s", "budget");
|
||||
fprintf(stderr, " %6s", "total");
|
||||
#define PRINT_PROFILE_HEADER(name, text, phase) \
|
||||
fprintf(stderr, " %6s", text);
|
||||
|
|
@ -1337,8 +1341,21 @@ Statistics::printSliceProfile()
|
|||
|
||||
maybePrintProfileHeaders();
|
||||
|
||||
fprintf(stderr, "MajorGC: %20s %1d -> %1d ",
|
||||
ExplainReason(slice.reason), int(slice.initialState), int(slice.finalState));
|
||||
bool shrinking = gckind == GC_SHRINK;
|
||||
bool reset = slice.resetReason != AbortReason::None;
|
||||
bool nonIncremental = nonincrementalReason_ != AbortReason::None;
|
||||
|
||||
fprintf(stderr, "MajorGC: %20s %1d -> %1d %1s%1s%1s ",
|
||||
ExplainReason(slice.reason),
|
||||
int(slice.initialState), int(slice.finalState),
|
||||
shrinking ? "S" : "",
|
||||
reset ? "R" : "",
|
||||
nonIncremental ? "N" : "");
|
||||
|
||||
if (!nonIncremental && !slice.budget.isUnlimited() && slice.budget.isTimeBudget())
|
||||
fprintf(stderr, " %6" PRIi64, static_cast<int64_t>(slice.budget.timeBudget.budget));
|
||||
else
|
||||
fprintf(stderr, " ");
|
||||
|
||||
ProfileDurations times;
|
||||
times[ProfileKey::Total] = slice.duration();
|
||||
|
|
@ -1357,7 +1374,7 @@ void
|
|||
Statistics::printTotalProfileTimes()
|
||||
{
|
||||
if (enableProfiling_) {
|
||||
fprintf(stderr, "MajorGC TOTALS: %7" PRIu64 " slices: ", sliceCount_);
|
||||
fprintf(stderr, "MajorGC TOTALS: %7" PRIu64 " slices: ", sliceCount_);
|
||||
printProfileTimes(totalTimes_);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -80,15 +80,15 @@ struct ZoneGCStats
|
|||
|
||||
#define FOR_EACH_GC_PROFILE_TIME(_) \
|
||||
_(BeginCallback, "bgnCB", PhaseKind::GC_BEGIN) \
|
||||
_(MinorForMajor, "evct4m", PhaseKind::EVICT_NURSERY_FOR_MAJOR_GC) \
|
||||
_(WaitBgThread, "waitBG", PhaseKind::WAIT_BACKGROUND_THREAD) \
|
||||
_(DiscardCode, "discrd", PhaseKind::MARK_DISCARD_CODE) \
|
||||
_(RelazifyFunc, "relzfy", PhaseKind::RELAZIFY_FUNCTIONS) \
|
||||
_(PurgeTables, "prgTbl", PhaseKind::PURGE_SHAPE_TABLES) \
|
||||
_(Purge, "purge", PhaseKind::PURGE) \
|
||||
_(Prepare, "prep", PhaseKind::PREPARE) \
|
||||
_(Mark, "mark", PhaseKind::MARK) \
|
||||
_(Sweep, "sweep", PhaseKind::SWEEP) \
|
||||
_(Compact, "cmpct", PhaseKind::COMPACT) \
|
||||
_(EndCallback, "endCB", PhaseKind::GC_END) \
|
||||
_(MinorGC, "minor", PhaseKind::MINOR_GC) \
|
||||
_(EvictNursery, "evict", PhaseKind::EVICT_NURSERY) \
|
||||
_(Barriers, "brrier", PhaseKind::BARRIER)
|
||||
|
||||
const char* ExplainAbortReason(gc::AbortReason reason);
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче