Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 08:15:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1573817: Remove unused seenBytes parameters from misc wasm memory accounting methods; r=luke

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D41959

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Benjamin Bouvier 2019-08-14 18:54:27 +00:00
parent 7c7b78d948
commit 5300b32c2e
7 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/src/vm/MemoryMetrics.cpp
View File

@ -183,7 +183,6 @@ struct StatsClosure {
ObjectPrivateVisitor* opv;
SourceSet seenSources;
wasm::Metadata::SeenSet wasmSeenMetadata;
wasm::ShareableBytes::SeenSet wasmSeenBytes;
wasm::Code::SeenSet wasmSeenCode;
wasm::Table::SeenSet wasmSeenTables;
bool anonymize;
@ -355,7 +354,7 @@ static void StatsCellCallback(JSRuntime* rt, void* data, void* thing,
CollectScriptSourceStats<granularity>(closure, ss);
}
module.addSizeOfMisc(rtStats->mallocSizeOf_, &closure->wasmSeenMetadata,
&closure->wasmSeenBytes, &closure->wasmSeenCode,
&closure->wasmSeenCode,
&info.objectsNonHeapCodeWasm,
&info.objectsMallocHeapMisc);
} else if (obj->is<WasmInstanceObject>()) {
@ -365,9 +364,8 @@ static void StatsCellCallback(JSRuntime* rt, void* data, void* thing,
}
instance.addSizeOfMisc(
rtStats->mallocSizeOf_, &closure->wasmSeenMetadata,
&closure->wasmSeenBytes, &closure->wasmSeenCode,
&closure->wasmSeenTables, &info.objectsNonHeapCodeWasm,
&info.objectsMallocHeapMisc);
&closure->wasmSeenCode, &closure->wasmSeenTables,
&info.objectsNonHeapCodeWasm, &info.objectsMallocHeapMisc);
}
realmStats.classInfo.add(info);

4
js/src/wasm/WasmDebug.cpp
View File

@ -455,11 +455,9 @@ bool DebugState::getSourceMappingURL(JSContext* cx,
void DebugState::addSizeOfMisc(MallocSizeOf mallocSizeOf,
Metadata::SeenSet* seenMetadata,
ShareableBytes::SeenSet* seenBytes,
Code::SeenSet* seenCode, size_t* code,
size_t* data) const {
code_->addSizeOfMiscIfNotSeen(mallocSizeOf, seenMetadata, seenCode, code,
data);
module_->addSizeOfMisc(mallocSizeOf, seenMetadata, seenBytes, seenCode, code,
data);
module_->addSizeOfMisc(mallocSizeOf, seenMetadata, seenCode, code, data);
}

1
js/src/wasm/WasmDebug.h
View File

@ -137,7 +137,6 @@ class DebugState {
// about:memory reporting:
void addSizeOfMisc(MallocSizeOf mallocSizeOf, Metadata::SeenSet* seenMetadata,
ShareableBytes::SeenSet* seenBytes,
Code::SeenSet* seenCode, size_t* code, size_t* data) const;
};

5
js/src/wasm/WasmInstance.cpp
View File

@ -2003,7 +2003,6 @@ void Instance::destroyBreakpointSite(JSFreeOp* fop, uint32_t offset) {
void Instance::addSizeOfMisc(MallocSizeOf mallocSizeOf,
Metadata::SeenSet* seenMetadata,
ShareableBytes::SeenSet* seenBytes,
Code::SeenSet* seenCode,
Table::SeenSet* seenTables, size_t* code,
size_t* data) const {
@ -2014,8 +2013,8 @@ void Instance::addSizeOfMisc(MallocSizeOf mallocSizeOf,
}
if (maybeDebug_) {
maybeDebug_->addSizeOfMisc(mallocSizeOf, seenMetadata, seenBytes, seenCode,
code, data);
maybeDebug_->addSizeOfMisc(mallocSizeOf, seenMetadata, seenCode, code,
data);
}
code_->addSizeOfMiscIfNotSeen(mallocSizeOf, seenMetadata, seenCode, code,

1
js/src/wasm/WasmInstance.h
View File

@ -174,7 +174,6 @@ class Instance {
// about:memory reporting:
void addSizeOfMisc(MallocSizeOf mallocSizeOf, Metadata::SeenSet* seenMetadata,
ShareableBytes::SeenSet* seenBytes,
Code::SeenSet* seenCode, Table::SeenSet* seenTables,
size_t* code, size_t* data) const;

1
js/src/wasm/WasmModule.cpp
View File

@ -415,7 +415,6 @@ RefPtr<JS::WasmModule> wasm::DeserializeModule(const uint8_t* bytecode,
/* virtual */
void Module::addSizeOfMisc(MallocSizeOf mallocSizeOf,
Metadata::SeenSet* seenMetadata,
ShareableBytes::SeenSet* seenBytes,
Code::SeenSet* seenCode, size_t* code,
size_t* data) const {
code_->addSizeOfMiscIfNotSeen(mallocSizeOf, seenMetadata, seenCode, code,

1
js/src/wasm/WasmModule.h
View File

@ -214,7 +214,6 @@ class Module : public JS::WasmModule {
// about:memory reporting:
void addSizeOfMisc(MallocSizeOf mallocSizeOf, Metadata::SeenSet* seenMetadata,
ShareableBytes::SeenSet* seenBytes,
Code::SeenSet* seenCode, size_t* code, size_t* data) const;
// GC malloc memory tracking: