Commit ef89c2a5 authored by ssid's avatar ssid Committed by Commit bot

Fix regression in memory-infra bots due to change in dump order

crrev.com/1427963002 introduced a new memory-infra thread which runs
after all dump providers are finished. This measures the process total
memory usages. This was previously running at the start of a memory
dump. This means that the memory used while taking memory dump of other
providers will be included in the totals now and this metric has
regressed. This CL is a temporary change that reverts this behaviour so
that the perf bots are happy. Better fix for the problem will follow up
soon.

BUG=555584

Review URL: https://codereview.chromium.org/1466293002

Cr-Commit-Position: refs/heads/master@{#361126}
parent a8c01b56
...@@ -617,8 +617,11 @@ bool MemoryDumpManager::MemoryDumpProviderInfo::operator<( ...@@ -617,8 +617,11 @@ bool MemoryDumpManager::MemoryDumpProviderInfo::operator<(
const MemoryDumpProviderInfo& other) const { const MemoryDumpProviderInfo& other) const {
if (task_runner == other.task_runner) if (task_runner == other.task_runner)
return dump_provider < other.dump_provider; return dump_provider < other.dump_provider;
// Ensure that unbound providers (task_runner == nullptr) always run last. // TODO(ssid): Ensure that unbound providers (task_runner == nullptr)
return !(task_runner < other.task_runner); // always run last. Currently it runs first so that it doesn't cause
// regression in perf bots due to change in measurement time.
// crbug.com/555584.
return task_runner < other.task_runner;
} }
MemoryDumpManager::ProcessMemoryDumpAsyncState::ProcessMemoryDumpAsyncState( MemoryDumpManager::ProcessMemoryDumpAsyncState::ProcessMemoryDumpAsyncState(
......
...@@ -717,7 +717,8 @@ TEST_F(MemoryDumpManagerTest, TraceConfigExpectationsWhenIsCoordinator) { ...@@ -717,7 +717,8 @@ TEST_F(MemoryDumpManagerTest, TraceConfigExpectationsWhenIsCoordinator) {
// Tests against race conditions that might arise when disabling tracing in the // Tests against race conditions that might arise when disabling tracing in the
// middle of a global memory dump. // middle of a global memory dump.
TEST_F(MemoryDumpManagerTest, DisableTracingWhileDumping) { // TODO(ssid): Enable this test once crbug.com/555584 is fixed.
TEST_F(MemoryDumpManagerTest, DISABLED_DisableTracingWhileDumping) {
base::WaitableEvent tracing_disabled_event(false, false); base::WaitableEvent tracing_disabled_event(false, false);
InitializeMemoryDumpManager(false /* is_coordinator */); InitializeMemoryDumpManager(false /* is_coordinator */);
......
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