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

Side by Side Diff: content/common/discardable_shared_memory_heap.cc

Issue 1259333003: [tracing] Add SkResourceCache as suballocation to avoid double counting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@skia_v1
Patch Set: Removing segment dump from base. Created 5 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/common/discardable_shared_memory_heap.h" 5 #include "content/common/discardable_shared_memory_heap.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/format_macros.h" 9 #include "base/format_macros.h"
10 #include "base/memory/discardable_shared_memory.h" 10 #include "base/memory/discardable_shared_memory.h"
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 while (offset < end) { 350 while (offset < end) {
351 Span* span = spans_[offset]; 351 Span* span = spans_[offset];
352 if (!IsInFreeList(span)) { 352 if (!IsInFreeList(span)) {
353 allocated_objects_count++; 353 allocated_objects_count++;
354 allocated_objects_size_in_bytes += span->length_ * block_size_; 354 allocated_objects_size_in_bytes += span->length_ * block_size_;
355 } 355 }
356 offset += span->length_; 356 offset += span->length_;
357 } 357 }
358 358
359 std::string segment_dump_name = 359 std::string segment_dump_name =
360 base::StringPrintf("discardable/segment_%d", segment_id); 360 base::StringPrintf("discardable/segments/segment_%d", segment_id);
361 base::trace_event::MemoryAllocatorDump* segment_dump = 361 base::trace_event::MemoryAllocatorDump* segment_dump =
362 pmd->CreateAllocatorDump(segment_dump_name); 362 pmd->CreateAllocatorDump(segment_dump_name);
363 segment_dump->AddScalar(base::trace_event::MemoryAllocatorDump::kNameSize, 363 segment_dump->AddScalar(base::trace_event::MemoryAllocatorDump::kNameSize,
364 base::trace_event::MemoryAllocatorDump::kUnitsBytes, 364 base::trace_event::MemoryAllocatorDump::kUnitsBytes,
365 static_cast<uint64_t>(size)); 365 static_cast<uint64_t>(size));
366 366
367 base::trace_event::MemoryAllocatorDump* obj_dump = 367 base::trace_event::MemoryAllocatorDump* obj_dump =
368 pmd->CreateAllocatorDump(segment_dump_name + "/allocated_objects"); 368 pmd->CreateAllocatorDump(segment_dump_name + "/allocated_objects");
369 obj_dump->AddScalar(base::trace_event::MemoryAllocatorDump::kNameObjectsCount, 369 obj_dump->AddScalar(base::trace_event::MemoryAllocatorDump::kNameObjectsCount,
370 base::trace_event::MemoryAllocatorDump::kUnitsObjects, 370 base::trace_event::MemoryAllocatorDump::kUnitsObjects,
(...skipping 21 matching lines...) Expand all
392 392
393 // static 393 // static
394 base::trace_event::MemoryAllocatorDumpGuid 394 base::trace_event::MemoryAllocatorDumpGuid
395 DiscardableSharedMemoryHeap::GetSegmentGUIDForTracing(uint64 tracing_process_id, 395 DiscardableSharedMemoryHeap::GetSegmentGUIDForTracing(uint64 tracing_process_id,
396 int32 segment_id) { 396 int32 segment_id) {
397 return base::trace_event::MemoryAllocatorDumpGuid(base::StringPrintf( 397 return base::trace_event::MemoryAllocatorDumpGuid(base::StringPrintf(
398 "discardable-x-process/%" PRIx64 "/%d", tracing_process_id, segment_id)); 398 "discardable-x-process/%" PRIx64 "/%d", tracing_process_id, segment_id));
399 } 399 }
400 400
401 } // namespace content 401 } // namespace content
OLDNEW
« no previous file with comments | « content/child/child_discardable_shared_memory_manager.cc ('k') | content/common/host_discardable_shared_memory_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698