Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(282)

Unified Diff: content/common/host_discardable_shared_memory_manager.cc

Issue 1407483003: Reland of [tracing] Display the locked size of discardable memory segment. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix. Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/common/host_discardable_shared_memory_manager.cc
diff --git a/content/common/host_discardable_shared_memory_manager.cc b/content/common/host_discardable_shared_memory_manager.cc
index 97351e5510538dd3fc1cbb6cdf0fbce27b5d5c0b..f7b039e81cd0d48c84815231460d8992168c86a3 100644
--- a/content/common/host_discardable_shared_memory_manager.cc
+++ b/content/common/host_discardable_shared_memory_manager.cc
@@ -176,14 +176,24 @@ bool HostDiscardableSharedMemoryManager::OnMemoryDump(
for (const auto& segment_entry : process_segments) {
const int segment_id = segment_entry.first;
const MemorySegment* segment = segment_entry.second.get();
+ if (!segment->memory()->mapped_size())
+ continue;
+
std::string dump_name = base::StringPrintf(
"discardable/process_%x/segment_%d", child_process_id, segment_id);
base::trace_event::MemoryAllocatorDump* dump =
pmd->CreateAllocatorDump(dump_name);
+
dump->AddScalar(base::trace_event::MemoryAllocatorDump::kNameSize,
base::trace_event::MemoryAllocatorDump::kUnitsBytes,
segment->memory()->mapped_size());
+ // Host can only tell if whole segment is locked or not.
+ dump->AddScalar(
+ "locked_size", base::trace_event::MemoryAllocatorDump::kUnitsBytes,
+ segment->memory()->IsMemoryLocked() ? segment->memory()->mapped_size()
+ : 0u);
+
// Create the cross-process ownership edge. If the child creates a
// corresponding dump for the same segment, this will avoid to
// double-count them in tracing. If, instead, no other process will emit a

Powered by Google App Engine
This is Rietveld 408576698