Commit 00823b21 authored by erikchen's avatar erikchen Committed by Commit bot

Remove scoped trackers from OnAllocateLockedDiscardableSharedMemory.

After the method was moved off the IO thread, the scoped trackers were no
longer relevant.

BUG=466405

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

Cr-Commit-Position: refs/heads/master@{#323987}
parent ac29a9ae
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
#include "base/lazy_instance.h" #include "base/lazy_instance.h"
#include "base/memory/discardable_memory.h" #include "base/memory/discardable_memory.h"
#include "base/numerics/safe_math.h" #include "base/numerics/safe_math.h"
#include "base/profiler/scoped_tracker.h"
#include "base/strings/string_number_conversions.h" #include "base/strings/string_number_conversions.h"
#include "base/sys_info.h" #include "base/sys_info.h"
#include "base/trace_event/trace_event.h" #include "base/trace_event/trace_event.h"
...@@ -190,11 +189,6 @@ void HostDiscardableSharedMemoryManager::AllocateLockedDiscardableSharedMemory( ...@@ -190,11 +189,6 @@ void HostDiscardableSharedMemoryManager::AllocateLockedDiscardableSharedMemory(
size_t size, size_t size,
DiscardableSharedMemoryId id, DiscardableSharedMemoryId id,
base::SharedMemoryHandle* shared_memory_handle) { base::SharedMemoryHandle* shared_memory_handle) {
// TODO(erikchen): Remove ScopedTracker below once http://crbug.com/466405
// is fixed.
tracked_objects::ScopedTracker tracking_profile1(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"466405 AllocateLockedDiscardableSharedMemory::Start"));
base::AutoLock lock(lock_); base::AutoLock lock(lock_);
// Make sure |id| is not already in use. // Make sure |id| is not already in use.
...@@ -216,19 +210,9 @@ void HostDiscardableSharedMemoryManager::AllocateLockedDiscardableSharedMemory( ...@@ -216,19 +210,9 @@ void HostDiscardableSharedMemoryManager::AllocateLockedDiscardableSharedMemory(
if (size < memory_limit_) if (size < memory_limit_)
limit = memory_limit_ - size; limit = memory_limit_ - size;
// TODO(erikchen): Remove ScopedTracker below once http://crbug.com/466405
// is fixed.
tracked_objects::ScopedTracker tracking_profile2(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"466405 AllocateLockedDiscardableSharedMemory::ReduceMemoryUsage"));
if (bytes_allocated_ > limit) if (bytes_allocated_ > limit)
ReduceMemoryUsageUntilWithinLimit(limit); ReduceMemoryUsageUntilWithinLimit(limit);
// TODO(erikchen): Remove ScopedTracker below once http://crbug.com/466405
// is fixed.
tracked_objects::ScopedTracker tracking_profile3(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"466405 AllocateLockedDiscardableSharedMemory::NewMemory"));
scoped_ptr<base::DiscardableSharedMemory> memory( scoped_ptr<base::DiscardableSharedMemory> memory(
new base::DiscardableSharedMemory); new base::DiscardableSharedMemory);
if (!memory->CreateAndMap(size)) { if (!memory->CreateAndMap(size)) {
...@@ -236,11 +220,6 @@ void HostDiscardableSharedMemoryManager::AllocateLockedDiscardableSharedMemory( ...@@ -236,11 +220,6 @@ void HostDiscardableSharedMemoryManager::AllocateLockedDiscardableSharedMemory(
return; return;
} }
// TODO(erikchen): Remove ScopedTracker below once http://crbug.com/466405
// is fixed.
tracked_objects::ScopedTracker tracking_profile4(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"466405 AllocateLockedDiscardableSharedMemory::ShareToProcess"));
if (!memory->ShareToProcess(process_handle, shared_memory_handle)) { if (!memory->ShareToProcess(process_handle, shared_memory_handle)) {
LOG(ERROR) << "Cannot share discardable memory segment"; LOG(ERROR) << "Cannot share discardable memory segment";
*shared_memory_handle = base::SharedMemory::NULLHandle(); *shared_memory_handle = base::SharedMemory::NULLHandle();
...@@ -254,12 +233,6 @@ void HostDiscardableSharedMemoryManager::AllocateLockedDiscardableSharedMemory( ...@@ -254,12 +233,6 @@ void HostDiscardableSharedMemoryManager::AllocateLockedDiscardableSharedMemory(
return; return;
} }
// TODO(erikchen): Remove ScopedTracker below once http://crbug.com/466405
// is fixed.
tracked_objects::ScopedTracker tracking_profile5(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"466405 "
"AllocateLockedDiscardableSharedMemory::BytesAllocatedChanged"));
bytes_allocated_ = checked_bytes_allocated.ValueOrDie(); bytes_allocated_ = checked_bytes_allocated.ValueOrDie();
BytesAllocatedChanged(bytes_allocated_); BytesAllocatedChanged(bytes_allocated_);
...@@ -268,13 +241,6 @@ void HostDiscardableSharedMemoryManager::AllocateLockedDiscardableSharedMemory( ...@@ -268,13 +241,6 @@ void HostDiscardableSharedMemoryManager::AllocateLockedDiscardableSharedMemory(
segments_.push_back(segment.get()); segments_.push_back(segment.get());
std::push_heap(segments_.begin(), segments_.end(), CompareMemoryUsageTime); std::push_heap(segments_.begin(), segments_.end(), CompareMemoryUsageTime);
// TODO(erikchen): Remove ScopedTracker below once http://crbug.com/466405
// is fixed.
tracked_objects::ScopedTracker tracking_profile6(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"466405 "
"AllocateLockedDiscardableSharedMemory::"
"ScheduleEnforceMemoryPolicy"));
if (bytes_allocated_ > memory_limit_) if (bytes_allocated_ > memory_limit_)
ScheduleEnforceMemoryPolicy(); ScheduleEnforceMemoryPolicy();
} }
......
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