Commit 825abe65 authored by hjd's avatar hjd Committed by Commit bot

Revert of memory-infra: Fill the memory dump callback result (2/2) (patchset...

Revert of memory-infra: Fill the memory dump callback result (2/2) (patchset #6 id:100001 of https://codereview.chromium.org/2766173003/ )

Reason for revert:
Causing build failure:
https://uberchromegw.corp.google.com/i/chromium.linux/builders/Linux%20Tests/builds/54494

Original issue's description:
> memory-infra: Fill the memory dump callback result (2/2)
>
> Fill in the part of the memory dump result struct
> that applies to OS's view of Chrome when finalizing
> a memory dump.
>
> BUG=703184
>
> Review-Url: https://codereview.chromium.org/2766173003
> Cr-Commit-Position: refs/heads/master@{#462849}
> Committed: https://chromium.googlesource.com/chromium/src/+/22fd5f0cf18a409dd72b96cb526a25a6cac88d24

TBR=primiano@chromium.org,fmeawad@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=703184

Review-Url: https://codereview.chromium.org/2806553005
Cr-Commit-Position: refs/heads/master@{#462864}
parent fc14e3a2
......@@ -98,15 +98,6 @@ void OnGlobalDumpDone(MemoryDumpCallback wrapped_callback,
}
}
void FillOsDumpFromProcessMemoryDump(
const ProcessMemoryDump* pmd,
MemoryDumpCallbackResult::OSMemDump* osDump) {
if (pmd->has_process_totals()) {
const ProcessMemoryTotals* totals = pmd->process_totals();
osDump->resident_set_kb = totals->resident_set_bytes() / 1024;
}
}
// Proxy class which wraps a ConvertableToTraceFormat owned by the
// |session_state| into a proxy object that can be added to the trace event log.
// This is to solve the problem that the MemoryDumpSessionState is refcounted
......@@ -815,10 +806,6 @@ void MemoryDumpManager::FinalizeDumpAndAddToTrace(
GetDumpsSumKb("partition_alloc/partitions/*", process_memory_dump);
result.chrome_dump.blink_gc_total_kb =
GetDumpsSumKb("blink_gc", process_memory_dump);
FillOsDumpFromProcessMemoryDump(process_memory_dump, &result.os_dump);
} else {
auto& os_dump = result.extra_processes_dump[pid];
FillOsDumpFromProcessMemoryDump(process_memory_dump, &os_dump);
}
}
......
......@@ -167,7 +167,6 @@ class BASE_EXPORT ProcessMemoryDump {
void AsValueInto(TracedValue* value) const;
ProcessMemoryTotals* process_totals() { return &process_totals_; }
const ProcessMemoryTotals* process_totals() const { return &process_totals_; }
bool has_process_totals() const { return has_process_totals_; }
void set_has_process_totals() { has_process_totals_ = true; }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment