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

Side by Side Diff: gpu/command_buffer/service/sync_point_manager.cc

Issue 935333002: Update from https://crrev.com/316786 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #include "gpu/command_buffer/service/sync_point_manager.h" 5 #include "gpu/command_buffer/service/sync_point_manager.h"
6 6
7 #include <climits> 7 #include <climits>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/rand_util.h" 10 #include "base/rand_util.h"
11 #include "base/sequence_checker.h"
11 12
12 namespace gpu { 13 namespace gpu {
13 14
14 static const int kMaxSyncBase = INT_MAX; 15 static const int kMaxSyncBase = INT_MAX;
15 16
16 SyncPointManager::SyncPointManager() 17 // static
18 SyncPointManager* SyncPointManager::Create(bool allow_threaded_calls) {
19 return new SyncPointManager(allow_threaded_calls);
20 }
21
22 SyncPointManager::SyncPointManager(bool allow_threaded_calls)
17 : next_sync_point_(base::RandInt(1, kMaxSyncBase)) { 23 : next_sync_point_(base::RandInt(1, kMaxSyncBase)) {
18 // To reduce the risk that a sync point created in a previous GPU process 24 // To reduce the risk that a sync point created in a previous GPU process
19 // will be in flight in the next GPU process, randomize the starting sync 25 // will be in flight in the next GPU process, randomize the starting sync
20 // point number. http://crbug.com/373452 26 // point number. http://crbug.com/373452
27
28 if (!allow_threaded_calls) {
29 sequence_checker_.reset(new base::SequenceChecker);
30 }
21 } 31 }
22 32
23 SyncPointManager::~SyncPointManager() { 33 SyncPointManager::~SyncPointManager() {
24 } 34 }
25 35
26 uint32 SyncPointManager::GenerateSyncPoint() { 36 uint32 SyncPointManager::GenerateSyncPoint() {
27 base::AutoLock lock(lock_); 37 base::AutoLock lock(lock_);
28 uint32 sync_point = next_sync_point_++; 38 uint32 sync_point = next_sync_point_++;
29 // When an integer overflow occurs, don't return 0. 39 // When an integer overflow occurs, don't return 0.
30 if (!sync_point) 40 if (!sync_point)
31 sync_point = next_sync_point_++; 41 sync_point = next_sync_point_++;
32 42
33 // Note: wrapping would take days for a buggy/compromized renderer that would 43 // Note: wrapping would take days for a buggy/compromized renderer that would
34 // insert sync points in a loop, but if that were to happen, better explicitly 44 // insert sync points in a loop, but if that were to happen, better explicitly
35 // crash the GPU process than risk worse. 45 // crash the GPU process than risk worse.
36 // For normal operation (at most a few per frame), it would take ~a year to 46 // For normal operation (at most a few per frame), it would take ~a year to
37 // wrap. 47 // wrap.
38 CHECK(sync_point_map_.find(sync_point) == sync_point_map_.end()); 48 CHECK(sync_point_map_.find(sync_point) == sync_point_map_.end());
39 sync_point_map_.insert(std::make_pair(sync_point, ClosureList())); 49 sync_point_map_.insert(std::make_pair(sync_point, ClosureList()));
40 return sync_point; 50 return sync_point;
41 } 51 }
42 52
43 void SyncPointManager::RetireSyncPoint(uint32 sync_point) { 53 void SyncPointManager::RetireSyncPoint(uint32 sync_point) {
44 DCHECK(thread_checker_.CalledOnValidThread()); 54 CheckSequencedThread();
45 ClosureList list; 55 ClosureList list;
46 { 56 {
47 base::AutoLock lock(lock_); 57 base::AutoLock lock(lock_);
48 SyncPointMap::iterator it = sync_point_map_.find(sync_point); 58 SyncPointMap::iterator it = sync_point_map_.find(sync_point);
49 if (it == sync_point_map_.end()) { 59 if (it == sync_point_map_.end()) {
50 LOG(ERROR) << "Attempted to retire sync point that" 60 LOG(ERROR) << "Attempted to retire sync point that"
51 " didn't exist or was already retired."; 61 " didn't exist or was already retired.";
52 return; 62 return;
53 } 63 }
54 list.swap(it->second); 64 list.swap(it->second);
55 sync_point_map_.erase(it); 65 sync_point_map_.erase(it);
56 } 66 }
57 for (ClosureList::iterator i = list.begin(); i != list.end(); ++i) 67 for (ClosureList::iterator i = list.begin(); i != list.end(); ++i)
58 i->Run(); 68 i->Run();
59 } 69 }
60 70
61 void SyncPointManager::AddSyncPointCallback(uint32 sync_point, 71 void SyncPointManager::AddSyncPointCallback(uint32 sync_point,
62 const base::Closure& callback) { 72 const base::Closure& callback) {
63 DCHECK(thread_checker_.CalledOnValidThread()); 73 CheckSequencedThread();
64 { 74 {
65 base::AutoLock lock(lock_); 75 base::AutoLock lock(lock_);
66 SyncPointMap::iterator it = sync_point_map_.find(sync_point); 76 SyncPointMap::iterator it = sync_point_map_.find(sync_point);
67 if (it != sync_point_map_.end()) { 77 if (it != sync_point_map_.end()) {
68 it->second.push_back(callback); 78 it->second.push_back(callback);
69 return; 79 return;
70 } 80 }
71 } 81 }
72 callback.Run(); 82 callback.Run();
73 } 83 }
74 84
75 bool SyncPointManager::IsSyncPointRetired(uint32 sync_point) { 85 bool SyncPointManager::IsSyncPointRetired(uint32 sync_point) {
76 DCHECK(thread_checker_.CalledOnValidThread()); 86 CheckSequencedThread();
77 { 87 {
78 base::AutoLock lock(lock_); 88 base::AutoLock lock(lock_);
79 SyncPointMap::iterator it = sync_point_map_.find(sync_point); 89 SyncPointMap::iterator it = sync_point_map_.find(sync_point);
80 return it == sync_point_map_.end(); 90 return it == sync_point_map_.end();
81 } 91 }
82 } 92 }
83 93
94 void SyncPointManager::CheckSequencedThread() {
95 DCHECK(!sequence_checker_ ||
96 sequence_checker_->CalledOnValidSequencedThread());
97 }
98
84 } // namespace gpu 99 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/sync_point_manager.h ('k') | gpu/command_buffer/service/test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698