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

Side by Side Diff: cc/resources/resource_pool.h

Issue 1265183002: Add memory tracking to TexturePool. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@textures3
Patch Set: rebase 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
« no previous file with comments | « no previous file | cc/resources/resource_pool.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 #ifndef CC_RESOURCES_RESOURCE_POOL_H_ 5 #ifndef CC_RESOURCES_RESOURCE_POOL_H_
6 #define CC_RESOURCES_RESOURCE_POOL_H_ 6 #define CC_RESOURCES_RESOURCE_POOL_H_
7 7
8 #include <deque> 8 #include <deque>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/trace_event/memory_dump_provider.h"
11 #include "cc/base/cc_export.h" 12 #include "cc/base/cc_export.h"
12 #include "cc/output/renderer.h" 13 #include "cc/output/renderer.h"
13 #include "cc/resources/resource.h" 14 #include "cc/resources/resource.h"
14 #include "cc/resources/resource_format.h" 15 #include "cc/resources/resource_format.h"
15 16
16 namespace cc { 17 namespace cc {
17 class ScopedResource; 18 class ScopedResource;
18 19
19 class CC_EXPORT ResourcePool { 20 class CC_EXPORT ResourcePool : public base::trace_event::MemoryDumpProvider {
20 public: 21 public:
21 static scoped_ptr<ResourcePool> Create(ResourceProvider* resource_provider, 22 static scoped_ptr<ResourcePool> Create(ResourceProvider* resource_provider,
22 GLenum target) { 23 GLenum target) {
23 return make_scoped_ptr(new ResourcePool(resource_provider, target)); 24 return make_scoped_ptr(new ResourcePool(resource_provider, target));
24 } 25 }
25 26
26 virtual ~ResourcePool(); 27 ~ResourcePool() override;
27 28
28 scoped_ptr<ScopedResource> AcquireResource(const gfx::Size& size, 29 scoped_ptr<ScopedResource> AcquireResource(const gfx::Size& size,
29 ResourceFormat format); 30 ResourceFormat format);
30 scoped_ptr<ScopedResource> TryAcquireResourceWithContentId(uint64 content_id); 31 scoped_ptr<ScopedResource> TryAcquireResourceWithContentId(uint64 content_id);
31 void ReleaseResource(scoped_ptr<ScopedResource> resource, 32 void ReleaseResource(scoped_ptr<ScopedResource> resource,
32 uint64_t content_id); 33 uint64_t content_id);
33 34
34 void SetResourceUsageLimits(size_t max_memory_usage_bytes, 35 void SetResourceUsageLimits(size_t max_memory_usage_bytes,
35 size_t max_unused_memory_usage_bytes, 36 size_t max_unused_memory_usage_bytes,
36 size_t max_resource_count); 37 size_t max_resource_count);
37 38
38 void ReduceResourceUsage(); 39 void ReduceResourceUsage();
39 // This might block if |wait_if_needed| is true and one of the currently 40 // This might block if |wait_if_needed| is true and one of the currently
40 // busy resources has a read lock fence that needs to be waited upon before 41 // busy resources has a read lock fence that needs to be waited upon before
41 // it can be locked for write again. 42 // it can be locked for write again.
42 void CheckBusyResources(bool wait_if_needed); 43 void CheckBusyResources(bool wait_if_needed);
43 44
44 size_t total_memory_usage_bytes() const { return memory_usage_bytes_; } 45 size_t total_memory_usage_bytes() const { return memory_usage_bytes_; }
45 size_t acquired_memory_usage_bytes() const { 46 size_t acquired_memory_usage_bytes() const {
46 return memory_usage_bytes_ - unused_memory_usage_bytes_; 47 return memory_usage_bytes_ - unused_memory_usage_bytes_;
47 } 48 }
48 size_t total_resource_count() const { return resource_count_; } 49 size_t total_resource_count() const { return resource_count_; }
49 size_t acquired_resource_count() const { 50 size_t acquired_resource_count() const {
50 return resource_count_ - unused_resources_.size(); 51 return resource_count_ - unused_resources_.size();
51 } 52 }
52 size_t busy_resource_count() const { return busy_resources_.size(); } 53 size_t busy_resource_count() const { return busy_resources_.size(); }
53 54
55 // Overridden from base::trace_event::MemoryDumpProvider:
56 bool OnMemoryDump(const base::trace_event::MemoryDumpArgs& args,
57 base::trace_event::ProcessMemoryDump* pmd) override;
58
54 protected: 59 protected:
55 ResourcePool(ResourceProvider* resource_provider, GLenum target); 60 ResourcePool(ResourceProvider* resource_provider, GLenum target);
56 61
57 bool ResourceUsageTooHigh(); 62 bool ResourceUsageTooHigh();
58 63
59 private: 64 private:
60 void DidFinishUsingResource(ScopedResource* resource, uint64_t content_id); 65 void DidFinishUsingResource(ScopedResource* resource, uint64_t content_id);
61 void DeleteResource(ScopedResource* resource); 66 void DeleteResource(ScopedResource* resource);
62 67
63 ResourceProvider* resource_provider_; 68 ResourceProvider* resource_provider_;
64 const GLenum target_; 69 const GLenum target_;
65 size_t max_memory_usage_bytes_; 70 size_t max_memory_usage_bytes_;
66 size_t max_unused_memory_usage_bytes_; 71 size_t max_unused_memory_usage_bytes_;
67 size_t max_resource_count_; 72 size_t max_resource_count_;
68 size_t memory_usage_bytes_; 73 size_t memory_usage_bytes_;
69 size_t unused_memory_usage_bytes_; 74 size_t unused_memory_usage_bytes_;
70 size_t resource_count_; 75 size_t resource_count_;
71 76
72 struct PoolResource { 77 struct PoolResource {
73 PoolResource(ScopedResource* resource, uint64_t content_id) 78 PoolResource(ScopedResource* resource, uint64_t content_id)
74 : resource(resource), content_id(content_id) {} 79 : resource(resource), content_id(content_id) {}
80 void OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd,
81 bool is_free) const;
82
75 ScopedResource* resource; 83 ScopedResource* resource;
76 uint64_t content_id; 84 uint64_t content_id;
77 }; 85 };
78 typedef std::deque<PoolResource> ResourceList; 86 typedef std::deque<PoolResource> ResourceList;
79 ResourceList unused_resources_; 87 ResourceList unused_resources_;
80 ResourceList busy_resources_; 88 ResourceList busy_resources_;
81 89
82 DISALLOW_COPY_AND_ASSIGN(ResourcePool); 90 DISALLOW_COPY_AND_ASSIGN(ResourcePool);
83 }; 91 };
84 92
85 } // namespace cc 93 } // namespace cc
86 94
87 #endif // CC_RESOURCES_RESOURCE_POOL_H_ 95 #endif // CC_RESOURCES_RESOURCE_POOL_H_
OLDNEW
« no previous file with comments | « no previous file | cc/resources/resource_pool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698