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

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

Issue 174453003: cc: Replace RasterTaskStateMap with a vector and brute force search instead of hash map lookups. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add comment Created 6 years, 10 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_PIXEL_BUFFER_RASTER_WORKER_POOL_H_ 5 #ifndef CC_RESOURCES_PIXEL_BUFFER_RASTER_WORKER_POOL_H_
6 #define CC_RESOURCES_PIXEL_BUFFER_RASTER_WORKER_POOL_H_ 6 #define CC_RESOURCES_PIXEL_BUFFER_RASTER_WORKER_POOL_H_
7 7
8 #include <deque> 8 #include <vector>
9 9
10 #include "base/containers/hash_tables.h"
11 #include "cc/resources/raster_worker_pool.h" 10 #include "cc/resources/raster_worker_pool.h"
12 11
13 #if defined(COMPILER_GCC)
14 namespace BASE_HASH_NAMESPACE {
15 template <>
16 struct hash<cc::internal::WorkerPoolTask*> {
17 size_t operator()(cc::internal::WorkerPoolTask* ptr) const {
18 return hash<size_t>()(reinterpret_cast<size_t>(ptr));
19 }
20 };
21 } // namespace BASE_HASH_NAMESPACE
22 #endif // COMPILER
23
24 namespace cc { 12 namespace cc {
25 13
26 class CC_EXPORT PixelBufferRasterWorkerPool : public RasterWorkerPool { 14 class CC_EXPORT PixelBufferRasterWorkerPool : public RasterWorkerPool {
27 public: 15 public:
28 virtual ~PixelBufferRasterWorkerPool(); 16 virtual ~PixelBufferRasterWorkerPool();
29 17
30 static scoped_ptr<RasterWorkerPool> Create( 18 static scoped_ptr<RasterWorkerPool> Create(
31 ResourceProvider* resource_provider, 19 ResourceProvider* resource_provider,
32 size_t max_transfer_buffer_usage_bytes); 20 size_t max_transfer_buffer_usage_bytes);
33 21
(...skipping 10 matching lines...) Expand all
44 virtual void ReleaseCanvasForRaster(internal::WorkerPoolTask* task, 32 virtual void ReleaseCanvasForRaster(internal::WorkerPoolTask* task,
45 const Resource* resource) OVERRIDE; 33 const Resource* resource) OVERRIDE;
46 34
47 protected: 35 protected:
48 PixelBufferRasterWorkerPool(internal::TaskGraphRunner* task_graph_runner, 36 PixelBufferRasterWorkerPool(internal::TaskGraphRunner* task_graph_runner,
49 ResourceProvider* resource_provider, 37 ResourceProvider* resource_provider,
50 size_t max_transfer_buffer_usage_bytes); 38 size_t max_transfer_buffer_usage_bytes);
51 39
52 private: 40 private:
53 struct RasterTaskState { 41 struct RasterTaskState {
54 RasterTaskState() 42 class TaskComparator {
55 : type(UNSCHEDULED), resource(NULL), required_for_activation(false) {} 43 public:
44 explicit TaskComparator(const internal::WorkerPoolTask* task)
45 : task_(task) {}
56 46
57 RasterTaskState& set_completed() { 47 bool operator()(const RasterTaskState& state) const {
58 type = COMPLETED; 48 return state.task == task_;
59 return *this; 49 }
60 } 50
61 RasterTaskState& set_required_for_activation(bool is_required) { 51 private:
62 required_for_activation = is_required; 52 const internal::WorkerPoolTask* task_;
63 return *this; 53 };
64 } 54
55 typedef std::vector<RasterTaskState> Vector;
56
57 RasterTaskState(internal::WorkerPoolTask* task,
58 bool required_for_activation)
59 : type(UNSCHEDULED),
60 task(task),
61 resource(NULL),
62 required_for_activation(required_for_activation) {}
65 63
66 enum { UNSCHEDULED, SCHEDULED, UPLOADING, COMPLETED } type; 64 enum { UNSCHEDULED, SCHEDULED, UPLOADING, COMPLETED } type;
65 internal::WorkerPoolTask* task;
67 const Resource* resource; 66 const Resource* resource;
68 bool required_for_activation; 67 bool required_for_activation;
69 }; 68 };
70 typedef internal::WorkerPoolTask* RasterTaskMapKey;
71 typedef base::hash_map<RasterTaskMapKey, RasterTaskState> RasterTaskStateMap;
72 69
73 // Overridden from RasterWorkerPool: 70 // Overridden from RasterWorkerPool:
74 virtual void OnRasterTasksFinished() OVERRIDE; 71 virtual void OnRasterTasksFinished() OVERRIDE;
75 virtual void OnRasterTasksRequiredForActivationFinished() OVERRIDE; 72 virtual void OnRasterTasksRequiredForActivationFinished() OVERRIDE;
76 73
77 void FlushUploads(); 74 void FlushUploads();
78 void CheckForCompletedUploads(); 75 void CheckForCompletedUploads();
79 void ScheduleCheckForCompletedRasterTasks(); 76 void ScheduleCheckForCompletedRasterTasks();
80 void OnCheckForCompletedRasterTasks(); 77 void OnCheckForCompletedRasterTasks();
81 void CheckForCompletedRasterTasks(); 78 void CheckForCompletedRasterTasks();
82 void ScheduleMoreTasks(); 79 void ScheduleMoreTasks();
83 unsigned PendingRasterTaskCount() const; 80 unsigned PendingRasterTaskCount() const;
84 bool HasPendingTasks() const; 81 bool HasPendingTasks() const;
85 bool HasPendingTasksRequiredForActivation() const; 82 bool HasPendingTasksRequiredForActivation() const;
86 void CheckForCompletedWorkerPoolTasks(); 83 void CheckForCompletedWorkerPoolTasks();
87 84
88 const char* StateName() const; 85 const char* StateName() const;
89 scoped_ptr<base::Value> StateAsValue() const; 86 scoped_ptr<base::Value> StateAsValue() const;
90 scoped_ptr<base::Value> ThrottleStateAsValue() const; 87 scoped_ptr<base::Value> ThrottleStateAsValue() const;
91 88
92 bool shutdown_; 89 bool shutdown_;
93 90
94 RasterTaskQueue raster_tasks_; 91 RasterTaskQueue raster_tasks_;
95 RasterTaskStateMap raster_task_states_; 92 RasterTaskState::Vector raster_task_states_;
96 TaskDeque raster_tasks_with_pending_upload_; 93 TaskDeque raster_tasks_with_pending_upload_;
97 TaskDeque completed_raster_tasks_; 94 TaskVector completed_raster_tasks_;
98 TaskDeque completed_image_decode_tasks_; 95 TaskVector completed_image_decode_tasks_;
99 96
100 size_t scheduled_raster_task_count_; 97 size_t scheduled_raster_task_count_;
101 size_t raster_tasks_required_for_activation_count_; 98 size_t raster_tasks_required_for_activation_count_;
102 size_t bytes_pending_upload_; 99 size_t bytes_pending_upload_;
103 size_t max_bytes_pending_upload_; 100 size_t max_bytes_pending_upload_;
104 bool has_performed_uploads_since_last_flush_; 101 bool has_performed_uploads_since_last_flush_;
105 base::TimeTicks check_for_completed_raster_tasks_time_; 102 base::TimeTicks check_for_completed_raster_tasks_time_;
106 bool check_for_completed_raster_tasks_pending_; 103 bool check_for_completed_raster_tasks_pending_;
107 104
108 bool should_notify_client_if_no_tasks_are_pending_; 105 bool should_notify_client_if_no_tasks_are_pending_;
109 bool should_notify_client_if_no_tasks_required_for_activation_are_pending_; 106 bool should_notify_client_if_no_tasks_required_for_activation_are_pending_;
110 bool raster_finished_task_pending_; 107 bool raster_finished_task_pending_;
111 bool raster_required_for_activation_finished_task_pending_; 108 bool raster_required_for_activation_finished_task_pending_;
112 109
113 // Task graph used when scheduling tasks and vector used to gather 110 // Task graph used when scheduling tasks and vector used to gather
114 // completed tasks. 111 // completed tasks.
115 internal::TaskGraph graph_; 112 internal::TaskGraph graph_;
116 internal::Task::Vector completed_tasks_; 113 internal::Task::Vector completed_tasks_;
117 114
118 base::WeakPtrFactory<PixelBufferRasterWorkerPool> weak_factory_; 115 base::WeakPtrFactory<PixelBufferRasterWorkerPool> weak_factory_;
119 116
120 DISALLOW_COPY_AND_ASSIGN(PixelBufferRasterWorkerPool); 117 DISALLOW_COPY_AND_ASSIGN(PixelBufferRasterWorkerPool);
121 }; 118 };
122 119
123 } // namespace cc 120 } // namespace cc
124 121
125 #endif // CC_RESOURCES_PIXEL_BUFFER_RASTER_WORKER_POOL_H_ 122 #endif // CC_RESOURCES_PIXEL_BUFFER_RASTER_WORKER_POOL_H_
OLDNEW
« no previous file with comments | « no previous file | cc/resources/pixel_buffer_raster_worker_pool.cc » ('j') | cc/resources/pixel_buffer_raster_worker_pool.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698