зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1513392 - move gathering total memory to before CanRecordReleaseData() bail r=erahm
Moves the trigger to gather total memory up about a hundred lines to the point before we bail on release so that it always triggers. Differential Revision: https://phabricator.services.mozilla.com/D38249 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
ee2f303e53
Коммит
cf865d560a
|
@ -245,6 +245,13 @@ nsresult MemoryTelemetry::GatherReports(
|
|||
// GHOST_WINDOWS is opt-out as of Firefox 55
|
||||
RECORD(GHOST_WINDOWS, GhostWindows, UNITS_COUNT);
|
||||
|
||||
// If we're running in the parent process, collect data from all processes for
|
||||
// the MEMORY_TOTAL histogram.
|
||||
if (XRE_IsParentProcess() && !mTotalMemoryGatherer) {
|
||||
mTotalMemoryGatherer = new TotalMemoryGatherer();
|
||||
mTotalMemoryGatherer->Begin(mThreadPool);
|
||||
}
|
||||
|
||||
if (!Telemetry::CanRecordReleaseData()) {
|
||||
return NS_OK;
|
||||
}
|
||||
|
@ -323,13 +330,6 @@ nsresult MemoryTelemetry::GatherReports(
|
|||
cleanup.release();
|
||||
}
|
||||
|
||||
// If we're running in the parent process, collect data from all processes for
|
||||
// the MEMORY_TOTAL histogram.
|
||||
if (XRE_IsParentProcess() && !mTotalMemoryGatherer) {
|
||||
mTotalMemoryGatherer = new TotalMemoryGatherer();
|
||||
mTotalMemoryGatherer->Begin(mThreadPool);
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче