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

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: android build fix Created 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | cc/resources/pixel_buffer_raster_worker_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 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 base::SequencedTaskRunner* task_runner, 19 base::SequencedTaskRunner* task_runner,
32 ResourceProvider* resource_provider, 20 ResourceProvider* resource_provider,
33 size_t max_transfer_buffer_usage_bytes); 21 size_t max_transfer_buffer_usage_bytes);
(...skipping 12 matching lines...) Expand all
46 const Resource* resource) OVERRIDE; 34 const Resource* resource) OVERRIDE;
47 35
48 protected: 36 protected:
49 PixelBufferRasterWorkerPool(base::SequencedTaskRunner* task_runner, 37 PixelBufferRasterWorkerPool(base::SequencedTaskRunner* task_runner,
50 internal::TaskGraphRunner* task_graph_runner, 38 internal::TaskGraphRunner* task_graph_runner,
51 ResourceProvider* resource_provider, 39 ResourceProvider* resource_provider,
52 size_t max_transfer_buffer_usage_bytes); 40 size_t max_transfer_buffer_usage_bytes);
53 41
54 private: 42 private:
55 struct RasterTaskState { 43 struct RasterTaskState {
56 RasterTaskState() 44 class TaskComparator {
57 : type(UNSCHEDULED), resource(NULL), required_for_activation(false) {} 45 public:
46 explicit TaskComparator(const internal::WorkerPoolTask* task)
47 : task_(task) {}
58 48
59 RasterTaskState& set_completed() { 49 bool operator()(const RasterTaskState& state) const {
60 type = COMPLETED; 50 return state.task == task_;
61 return *this; 51 }
62 } 52
63 RasterTaskState& set_required_for_activation(bool is_required) { 53 private:
64 required_for_activation = is_required; 54 const internal::WorkerPoolTask* task_;
65 return *this; 55 };
66 } 56
57 typedef std::vector<RasterTaskState> Vector;
58
59 RasterTaskState(internal::WorkerPoolTask* task,
60 bool required_for_activation)
61 : type(UNSCHEDULED),
62 task(task),
63 resource(NULL),
64 required_for_activation(required_for_activation) {}
67 65
68 enum { UNSCHEDULED, SCHEDULED, UPLOADING, COMPLETED } type; 66 enum { UNSCHEDULED, SCHEDULED, UPLOADING, COMPLETED } type;
67 internal::WorkerPoolTask* task;
69 const Resource* resource; 68 const Resource* resource;
70 bool required_for_activation; 69 bool required_for_activation;
71 }; 70 };
72 typedef internal::WorkerPoolTask* RasterTaskMapKey;
73 typedef base::hash_map<RasterTaskMapKey, RasterTaskState> RasterTaskStateMap;
74 71
75 // Overridden from RasterWorkerPool: 72 // Overridden from RasterWorkerPool:
76 virtual void OnRasterTasksFinished() OVERRIDE; 73 virtual void OnRasterTasksFinished() OVERRIDE;
77 virtual void OnRasterTasksRequiredForActivationFinished() OVERRIDE; 74 virtual void OnRasterTasksRequiredForActivationFinished() OVERRIDE;
78 75
79 void FlushUploads(); 76 void FlushUploads();
80 void CheckForCompletedUploads(); 77 void CheckForCompletedUploads();
81 void ScheduleCheckForCompletedRasterTasks(); 78 void ScheduleCheckForCompletedRasterTasks();
82 void OnCheckForCompletedRasterTasks(); 79 void OnCheckForCompletedRasterTasks();
83 void CheckForCompletedRasterTasks(); 80 void CheckForCompletedRasterTasks();
84 void ScheduleMoreTasks(); 81 void ScheduleMoreTasks();
85 unsigned PendingRasterTaskCount() const; 82 unsigned PendingRasterTaskCount() const;
86 bool HasPendingTasks() const; 83 bool HasPendingTasks() const;
87 bool HasPendingTasksRequiredForActivation() const; 84 bool HasPendingTasksRequiredForActivation() const;
88 void CheckForCompletedWorkerPoolTasks(); 85 void CheckForCompletedWorkerPoolTasks();
89 86
90 const char* StateName() const; 87 const char* StateName() const;
91 scoped_ptr<base::Value> StateAsValue() const; 88 scoped_ptr<base::Value> StateAsValue() const;
92 scoped_ptr<base::Value> ThrottleStateAsValue() const; 89 scoped_ptr<base::Value> ThrottleStateAsValue() const;
93 90
94 bool shutdown_; 91 bool shutdown_;
95 92
96 RasterTaskQueue raster_tasks_; 93 RasterTaskQueue raster_tasks_;
97 RasterTaskStateMap raster_task_states_; 94 RasterTaskState::Vector raster_task_states_;
98 TaskDeque raster_tasks_with_pending_upload_; 95 TaskDeque raster_tasks_with_pending_upload_;
99 TaskDeque completed_raster_tasks_; 96 TaskVector completed_raster_tasks_;
100 TaskDeque completed_image_decode_tasks_; 97 TaskVector completed_image_decode_tasks_;
101 98
102 size_t scheduled_raster_task_count_; 99 size_t scheduled_raster_task_count_;
103 size_t raster_tasks_required_for_activation_count_; 100 size_t raster_tasks_required_for_activation_count_;
104 size_t bytes_pending_upload_; 101 size_t bytes_pending_upload_;
105 size_t max_bytes_pending_upload_; 102 size_t max_bytes_pending_upload_;
106 bool has_performed_uploads_since_last_flush_; 103 bool has_performed_uploads_since_last_flush_;
107 base::TimeTicks check_for_completed_raster_tasks_time_; 104 base::TimeTicks check_for_completed_raster_tasks_time_;
108 bool check_for_completed_raster_tasks_pending_; 105 bool check_for_completed_raster_tasks_pending_;
109 106
110 bool should_notify_client_if_no_tasks_are_pending_; 107 bool should_notify_client_if_no_tasks_are_pending_;
111 bool should_notify_client_if_no_tasks_required_for_activation_are_pending_; 108 bool should_notify_client_if_no_tasks_required_for_activation_are_pending_;
112 bool raster_finished_task_pending_; 109 bool raster_finished_task_pending_;
113 bool raster_required_for_activation_finished_task_pending_; 110 bool raster_required_for_activation_finished_task_pending_;
114 111
115 // Task graph used when scheduling tasks and vector used to gather 112 // Task graph used when scheduling tasks and vector used to gather
116 // completed tasks. 113 // completed tasks.
117 internal::TaskGraph graph_; 114 internal::TaskGraph graph_;
118 internal::Task::Vector completed_tasks_; 115 internal::Task::Vector completed_tasks_;
119 116
120 base::WeakPtrFactory<PixelBufferRasterWorkerPool> weak_factory_; 117 base::WeakPtrFactory<PixelBufferRasterWorkerPool> weak_factory_;
121 118
122 DISALLOW_COPY_AND_ASSIGN(PixelBufferRasterWorkerPool); 119 DISALLOW_COPY_AND_ASSIGN(PixelBufferRasterWorkerPool);
123 }; 120 };
124 121
125 } // namespace cc 122 } // namespace cc
126 123
127 #endif // CC_RESOURCES_PIXEL_BUFFER_RASTER_WORKER_POOL_H_ 124 #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') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698