Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 22:05:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 913881, part 6 - Measure weak map representations in the cycle collector graph. r=njn

Browse Source 
Contrary to the comment here, I'm pretty sure this needs to be measured. mWeakMaps
is an array of little structs. Of course, in practice I doubt this amounts to anything.
This commit is contained in:
Andrew McCreight 2013-09-10 08:56:36 -07:00
parent 37a96c3566
commit 946af7a12e
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
xpcom/base/nsCycleCollector.cpp
View File

@ -616,12 +616,14 @@ struct GCGraph
}
void SizeOfExcludingThis(MallocSizeOf aMallocSizeOf,
size_t *aNodesSize, size_t *aEdgesSize) const {
size_t *aNodesSize, size_t *aEdgesSize,
size_t *aWeakMapsSize) const {
*aNodesSize = mNodes.SizeOfExcludingThis(aMallocSizeOf);
*aEdgesSize = mEdges.SizeOfExcludingThis(aMallocSizeOf);
// These fields are deliberately not measured:
// - mWeakMaps entries, because the pointers are non-owning
// We don't measure what the WeakMappings point to, because the
// pointers are non-owning.
*aWeakMapsSize = mWeakMaps.SizeOfExcludingThis(aMallocSizeOf);
}
};
@ -976,6 +978,7 @@ public:
size_t *aObjectSize,
size_t *aGraphNodesSize,
size_t *aGraphEdgesSize,
size_t *aWeakMapsSize,
size_t *aWhiteNodeSize,
size_t *aPurpleBufferSize) const;
@ -2405,11 +2408,13 @@ class CycleCollectorMultiReporter MOZ_FINAL : public nsIMemoryMultiReporter
NS_IMETHOD CollectReports(nsIMemoryMultiReporterCallback* aCb,
nsISupports* aClosure)
{
size_t objectSize, graphNodesSize, graphEdgesSize, whiteNodesSize,
purpleBufferSize;
size_t objectSize, graphNodesSize, graphEdgesSize, weakMapsSize,
whiteNodesSize, purpleBufferSize;
mCollector->SizeOfIncludingThis(MallocSizeOf,
&objectSize, &graphNodesSize,
&graphEdgesSize, &whiteNodesSize,
&objectSize,
&graphNodesSize, &graphEdgesSize,
&weakMapsSize,
&whiteNodesSize,
&purpleBufferSize);
#define REPORT(_path, _amount, _desc) \
@ -2436,6 +2441,11 @@ class CycleCollectorMultiReporter MOZ_FINAL : public nsIMemoryMultiReporter
"Memory used for the edges of the cycle collector's graph. "
"This should be zero when the collector is idle.");
REPORT("explicit/cycle-collector/weak-maps", weakMapsSize,
"Memory used for the representation of weak maps in the "
"cycle collector's graph. "
"This should be zero when the collector is idle.");
REPORT("explicit/cycle-collector/white-nodes", whiteNodesSize,
"Memory used for the cycle collector's white nodes array. "
"This should be zero when the collector is idle.");
@ -2817,12 +2827,14 @@ nsCycleCollector::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf,
size_t *aObjectSize,
size_t *aGraphNodesSize,
size_t *aGraphEdgesSize,
size_t *aWeakMapsSize,
size_t *aWhiteNodeSize,
size_t *aPurpleBufferSize) const
{
*aObjectSize = aMallocSizeOf(this);
mGraph.SizeOfExcludingThis(aMallocSizeOf, aGraphNodesSize, aGraphEdgesSize);
mGraph.SizeOfExcludingThis(aMallocSizeOf, aGraphNodesSize, aGraphEdgesSize,
aWeakMapsSize);
// No need to measure what the entries point to; the pointers are
// non-owning.