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

Bug 1652883 - Shared surfaces memory reporter should give KIND_OTHER a different path. r=aosmond

Browse Source 
If you do a diff, all of the different shared surfaces get merged together,
because the diffing process removes all PIDs from the paths. This means
you end up hitting an assertion when the diffing process tries to combine
entries with the same path but different kinds.

Differential Revision: https://phabricator.services.mozilla.com/D83585
This commit is contained in:
Andrew McCreight 2020-07-17 00:02:13 +00:00
parent 33a2a16963
commit fcd1e87558
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
image/ImageMemoryReporter.cpp
View File

@ -110,18 +110,24 @@ void ImageMemoryReporter::ReportSharedSurface(
path.AppendInt(aEntry.mConsumers);
path.AppendLiteral(", creator_ref:");
path.AppendInt(aEntry.mCreatorRef);
path.AppendLiteral(")/decoded-nonheap");
path.AppendLiteral(")/decoded-");
size_t surfaceSize = mozilla::ipc::SharedMemory::PageAlignedSize(
aEntry.mSize.height * aEntry.mStride);
// If this memory has already been reported elsewhere (e.g. as part of our
// explicit section in the surface cache), we don't want report it again as
// KIND_NONHEAP and have it counted again.
// KIND_NONHEAP and have it counted again. The paths must be different if the
// kinds are different to avoid problems when diffing memory reports.
bool sameProcess = aEntry.mCreatorPid == base::GetCurrentProcId();
int32_t kind = aIsForCompositor && !sameProcess
? nsIMemoryReporter::KIND_NONHEAP
: nsIMemoryReporter::KIND_OTHER;
int32_t kind;
if (aIsForCompositor && !sameProcess) {
path.AppendLiteral("nonheap");
kind = nsIMemoryReporter::KIND_NONHEAP;
} else {
path.AppendLiteral("other");
kind = nsIMemoryReporter::KIND_OTHER;
}
constexpr auto desc = "Decoded image data stored in shared memory."_ns;
aHandleReport->Callback(EmptyCString(), path, kind,