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

Unified Diff: cc/resources/resource_pool.cc

Issue 12502016: cc: Add command line switch to control resource usage for impl-side painting. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: MRU eviction pattern Created 7 years, 9 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
« no previous file with comments | « cc/resources/resource_pool.h ('k') | cc/resources/tile_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/resource_pool.cc
diff --git a/cc/resources/resource_pool.cc b/cc/resources/resource_pool.cc
index 3cd45d8d5d7d8d6f180900981adc4e3ea6f4e122..6bf03804a6117dde4ea4b0f9241d35f879eb8d6e 100644
--- a/cc/resources/resource_pool.cc
+++ b/cc/resources/resource_pool.cc
@@ -30,7 +30,8 @@ ResourcePool::Resource::~Resource() {
ResourcePool::ResourcePool(ResourceProvider* resource_provider)
: resource_provider_(resource_provider),
max_memory_usage_bytes_(0),
- memory_usage_bytes_(0) {
+ memory_usage_bytes_(0),
+ acquired_memory_usage_bytes_(0) {
}
ResourcePool::~ResourcePool() {
@@ -55,6 +56,7 @@ scoped_ptr<ResourcePool::Resource> ResourcePool::AcquireResource(
continue;
resources_.erase(it);
+ acquired_memory_usage_bytes_ += resource->bytes();
return make_scoped_ptr(resource);
}
@@ -68,11 +70,13 @@ scoped_ptr<ResourcePool::Resource> ResourcePool::AcquireResource(
resource_provider_->EnableReadLockFences(resource->id(), true);
memory_usage_bytes_ += resource->bytes();
+ acquired_memory_usage_bytes_ += resource->bytes();
return make_scoped_ptr(resource);
}
void ResourcePool::ReleaseResource(
scoped_ptr<ResourcePool::Resource> resource) {
+ acquired_memory_usage_bytes_ -= resource->bytes();
if (memory_usage_bytes_ > max_memory_usage_bytes_) {
memory_usage_bytes_ -= resource->bytes();
return;
@@ -87,11 +91,31 @@ void ResourcePool::SetMaxMemoryUsageBytes(size_t max_memory_usage_bytes) {
while (!resources_.empty()) {
if (memory_usage_bytes_ <= max_memory_usage_bytes_)
break;
- Resource* resource = resources_.front();
- resources_.pop_front();
- memory_usage_bytes_ -= resource->bytes();
- delete resource;
+
+ EvictOneResource();
+ }
+}
+
+void ResourcePool::ReduceMemoryUsage() {
+ size_t ten_percent_of_memory = max_memory_usage_bytes_ / 10;
piman 2013/03/25 18:13:46 What would happen if we didn't try to keep anythin
reveman 2013/03/25 18:36:06 we have to pay the cost of allocating texture, pix
nduca 2013/03/25 18:37:49 How does this compare to a "please drop everything
reveman 2013/03/25 18:47:33 if we drop everything then initializing a new pend
+ while (!resources_.empty()) {
+ size_t wasted_usage_bytes =
+ memory_usage_bytes_ - acquired_memory_usage_bytes_;
+ if (wasted_usage_bytes <= ten_percent_of_memory)
+ break;
+
+ EvictOneResource();
}
}
+void ResourcePool::EvictOneResource() {
+ DCHECK(!resources_.empty());
+ // MRU eviction pattern as least recently used is less likely to
+ // be blocked by read lock fence.
+ Resource* resource = resources_.back();
+ resources_.pop_back();
+ memory_usage_bytes_ -= resource->bytes();
+ delete resource;
+}
+
} // namespace cc
« no previous file with comments | « cc/resources/resource_pool.h ('k') | cc/resources/tile_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698