wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 760352 (part 2) - Treeify non-JS-compartment KIND_OTHER memory reports where appropriate. r=jlebar.

Browse Source 
--HG--
extra : rebase_source : 886b3d40a8dc5f7092ed35ffe280814576ca021b
This commit is contained in:
Nicholas Nethercote 2012-06-11 20:32:26 -07:00
parent d09087aa9d
commit 51b1dd666a
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dom/base/nsWindowMemoryReporter.cpp
View File

@ -307,60 +307,60 @@ nsWindowMemoryReporter::CollectReports(nsIMemoryMultiReporterCallback* aCb,
NS_ENSURE_SUCCESS(rv, rv); \
} while (0)
REPORT("window-objects-dom-other", windowTotalSizes.mDOMOther,
REPORT("window-objects/dom/other", windowTotalSizes.mDOMOther,
"Memory used for the DOM within windows, "
"excluding element, text, CDATA, and comment nodes. "
"This is the sum of all windows' 'dom/other' numbers.");
REPORT("window-objects-dom-element-nodes", windowTotalSizes.mDOMElementNodes,
REPORT("window-objects/dom/element-nodes", windowTotalSizes.mDOMElementNodes,
"Memory used for DOM element nodes within windows. "
"This is the sum of all windows' 'dom/element-nodes' numbers.");
REPORT("window-objects-dom-text-nodes", windowTotalSizes.mDOMTextNodes,
REPORT("window-objects/dom/text-nodes", windowTotalSizes.mDOMTextNodes,
"Memory used for DOM text nodes within windows. "
"This is the sum of all windows' 'dom/text-nodes' numbers.");
REPORT("window-objects-dom-cdata-nodes", windowTotalSizes.mDOMCDATANodes,
REPORT("window-objects/dom/cdata-nodes", windowTotalSizes.mDOMCDATANodes,
"Memory used for DOM CDATA nodes within windows. "
"This is the sum of all windows' 'dom/cdata-nodes' numbers.");
REPORT("window-objects-dom-comment-nodes", windowTotalSizes.mDOMCommentNodes,
REPORT("window-objects/dom/comment-nodes", windowTotalSizes.mDOMCommentNodes,
"Memory used for DOM comment nodes within windows. "
"This is the sum of all windows' 'dom/comment-nodes' numbers.");
REPORT("window-objects-style-sheets", windowTotalSizes.mStyleSheets,
REPORT("window-objects/style-sheets", windowTotalSizes.mStyleSheets,
"Memory used for style sheets within windows. "
"This is the sum of all windows' 'style-sheets' numbers.");
REPORT("window-objects-layout-pres-shell", windowTotalSizes.mLayoutPresShell,
REPORT("window-objects/layout/pres-shell", windowTotalSizes.mLayoutPresShell,
"Memory used by layout PresShell and other related "
"areas within windows. This is the sum of all windows' "
"'layout/arenas' numbers.");
REPORT("window-objects-layout-line-boxes",
REPORT("window-objects/layout/line-boxes",
windowTotalSizes.mArenaStats.mLineBoxes,
"Memory used for line-boxes within windows. "
"This is the sum of all windows' 'layout/line-boxes' numbers.");
REPORT("window-objects-layout-rule-nodes",
REPORT("window-objects/layout/rule-nodes",
windowTotalSizes.mArenaStats.mRuleNodes,
"Memory used for CSS rule nodes within windows. "
"This is the sum of all windows' 'layout/rule-nodes' numbers.");
REPORT("window-objects-layout-style-contexts",
REPORT("window-objects/layout/style-contexts",
windowTotalSizes.mArenaStats.mStyleContexts,
"Memory used for style contexts within windows. "
"This is the sum of all windows' 'layout/style-contexts' numbers.");
REPORT("window-objects-layout-style-sets", windowTotalSizes.mLayoutStyleSets,
REPORT("window-objects/layout/style-sets", windowTotalSizes.mLayoutStyleSets,
"Memory used for style sets within windows. "
"This is the sum of all windows' 'layout/style-sets' numbers.");
REPORT("window-objects-layout-text-runs", windowTotalSizes.mLayoutTextRuns,
REPORT("window-objects/layout/text-runs", windowTotalSizes.mLayoutTextRuns,
"Memory used for text runs within windows. "
"This is the sum of all windows' 'layout/text-runs' numbers.");
REPORT("window-objects-layout-pres-contexts", windowTotalSizes.mLayoutPresContext,
REPORT("window-objects/layout/pres-contexts", windowTotalSizes.mLayoutPresContext,
"Memory used for layout PresContexts within windows. "
"This is the sum of all windows' 'layout/pres-contexts' numbers.");
@ -370,7 +370,7 @@ nsWindowMemoryReporter::CollectReports(nsIMemoryMultiReporterCallback* aCb,
#include "nsFrameIdList.h"
#undef FRAME_ID
REPORT("window-objects-layout-frames", frameTotal,
REPORT("window-objects/layout/frames", frameTotal,
"Memory used for layout frames within windows. "
"This is the sum of all windows' 'layout/frames/' numbers.");

4
js/xpconnect/src/XPCJSRuntime.cpp
View File

@ -1220,7 +1220,7 @@ GetJSUserCompartmentCount()
// easily report them via telemetry, so we live with the small risk of
// inconsistencies.
NS_MEMORY_REPORTER_IMPLEMENT(XPConnectJSSystemCompartmentCount,
"js-compartments-system",
"js-compartments/system",
KIND_OTHER,
nsIMemoryReporter::UNITS_COUNT,
GetJSSystemCompartmentCount,
@ -1230,7 +1230,7 @@ NS_MEMORY_REPORTER_IMPLEMENT(XPConnectJSSystemCompartmentCount,
"but such cases should be rare.")
NS_MEMORY_REPORTER_IMPLEMENT(XPConnectJSUserCompartmentCount,
"js-compartments-user",
"js-compartments/user",
KIND_OTHER,
nsIMemoryReporter::UNITS_COUNT,
GetJSUserCompartmentCount,

8
toolkit/components/telemetry/TelemetryPing.js
View File

@ -42,8 +42,8 @@ const RW_OWNER = 0600;
//
const MEM_HISTOGRAMS = {
"js-gc-heap": "MEMORY_JS_GC_HEAP",
"js-compartments-system": "MEMORY_JS_COMPARTMENTS_SYSTEM",
"js-compartments-user": "MEMORY_JS_COMPARTMENTS_USER",
"js-compartments/system": "MEMORY_JS_COMPARTMENTS_SYSTEM",
"js-compartments/user": "MEMORY_JS_COMPARTMENTS_USER",
"explicit": "MEMORY_EXPLICIT",
"resident": "MEMORY_RESIDENT",
"storage-sqlite": "MEMORY_STORAGE_SQLITE",
@ -53,8 +53,8 @@ const MEM_HISTOGRAMS = {
"heap-committed-unused": "MEMORY_HEAP_COMMITTED_UNUSED",
"heap-committed-unused-ratio": "MEMORY_HEAP_COMMITTED_UNUSED_RATIO",
"page-faults-hard": "PAGE_FAULTS_HARD",
"low-memory-events-virtual": "LOW_MEMORY_EVENTS_VIRTUAL",
"low-memory-events-physical": "LOW_MEMORY_EVENTS_PHYSICAL",
"low-memory-events/virtual": "LOW_MEMORY_EVENTS_VIRTUAL",
"low-memory-events/physical": "LOW_MEMORY_EVENTS_PHYSICAL",
"ghost-windows": "GHOST_WINDOWS"
};

4
xpcom/base/AvailableMemoryTracker.cpp
View File

@ -337,7 +337,7 @@ public:
NS_IMETHOD GetPath(nsACString &aPath)
{
aPath.AssignLiteral("low-memory-events-virtual");
aPath.AssignLiteral("low-memory-events/virtual");
return NS_OK;
}
@ -425,7 +425,7 @@ public:
NS_IMETHOD GetPath(nsACString &aPath)
{
aPath.AssignLiteral("low-memory-events-physical");
aPath.AssignLiteral("low-memory-events/physical");
return NS_OK;
}