| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| 11 #include "webrtc/rtc_base/thread_annotations.h" | 11 #include "webrtc/rtc_base/thread_annotations.h" |
| 12 #include "webrtc/test/gtest.h" | 12 #include "webrtc/test/gtest.h" |
| 13 | 13 |
| 14 namespace { | 14 namespace { |
| 15 | 15 |
| 16 class LOCKABLE Lock { | 16 class RTC_LOCKABLE Lock { |
| 17 public: | 17 public: |
| 18 void EnterWrite() const EXCLUSIVE_LOCK_FUNCTION() {} | 18 void EnterWrite() const RTC_EXCLUSIVE_LOCK_FUNCTION() {} |
| 19 void EnterRead() const SHARED_LOCK_FUNCTION() {} | 19 void EnterRead() const RTC_SHARED_LOCK_FUNCTION() {} |
| 20 bool TryEnterWrite() const EXCLUSIVE_TRYLOCK_FUNCTION(true) { return true; } | 20 bool TryEnterWrite() const RTC_EXCLUSIVE_TRYLOCK_FUNCTION(true) { |
| 21 bool TryEnterRead() const SHARED_TRYLOCK_FUNCTION(true) { return true; } | 21 return true; |
| 22 void Leave() const UNLOCK_FUNCTION() {} | 22 } |
| 23 bool TryEnterRead() const RTC_SHARED_TRYLOCK_FUNCTION(true) { return true; } |
| 24 void Leave() const RTC_UNLOCK_FUNCTION() {} |
| 23 }; | 25 }; |
| 24 | 26 |
| 25 class SCOPED_LOCKABLE ScopeLock { | 27 class RTC_SCOPED_LOCKABLE ScopeLock { |
| 26 public: | 28 public: |
| 27 explicit ScopeLock(const Lock& lock) EXCLUSIVE_LOCK_FUNCTION(lock) {} | 29 explicit ScopeLock(const Lock& lock) RTC_EXCLUSIVE_LOCK_FUNCTION(lock) {} |
| 28 ~ScopeLock() UNLOCK_FUNCTION() {} | 30 ~ScopeLock() RTC_UNLOCK_FUNCTION() {} |
| 29 }; | 31 }; |
| 30 | 32 |
| 31 class ThreadSafe { | 33 class ThreadSafe { |
| 32 public: | 34 public: |
| 33 ThreadSafe() { | 35 ThreadSafe() { |
| 34 pt_protected_by_lock_ = new int; | 36 pt_protected_by_lock_ = new int; |
| 35 pt_protected_by_anything_ = new int; | 37 pt_protected_by_anything_ = new int; |
| 36 } | 38 } |
| 37 | 39 |
| 38 ~ThreadSafe() { | 40 ~ThreadSafe() { |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 unprotected_ = protected_by_lock_; | 116 unprotected_ = protected_by_lock_; |
| 115 unprotected_ = *pt_protected_by_lock_; | 117 unprotected_ = *pt_protected_by_lock_; |
| 116 } | 118 } |
| 117 | 119 |
| 118 void WriteProtectedFunction() EXCLUSIVE_LOCKS_REQUIRED(lock_, pt_lock_) { | 120 void WriteProtectedFunction() EXCLUSIVE_LOCKS_REQUIRED(lock_, pt_lock_) { |
| 119 int x = protected_by_lock_; | 121 int x = protected_by_lock_; |
| 120 *pt_protected_by_lock_ = x; | 122 *pt_protected_by_lock_ = x; |
| 121 protected_by_lock_ = unprotected_; | 123 protected_by_lock_ = unprotected_; |
| 122 } | 124 } |
| 123 | 125 |
| 124 const Lock& GetLock() LOCK_RETURNED(lock_) { return lock_; } | 126 const Lock& GetLock() RTC_LOCK_RETURNED(lock_) { return lock_; } |
| 125 | 127 |
| 126 Lock anylock_ ACQUIRED_BEFORE(lock_); | 128 Lock anylock_ ACQUIRED_BEFORE(lock_); |
| 127 Lock lock_; | 129 Lock lock_; |
| 128 Lock pt_lock_ ACQUIRED_AFTER(lock_); | 130 Lock pt_lock_ ACQUIRED_AFTER(lock_); |
| 129 | 131 |
| 130 int unprotected_ = 0; | 132 int unprotected_ = 0; |
| 131 | 133 |
| 132 int protected_by_lock_ GUARDED_BY(lock_) = 0; | 134 int protected_by_lock_ GUARDED_BY(lock_) = 0; |
| 133 int protected_by_anything_ GUARDED_VAR = 0; | 135 int protected_by_anything_ RTC_GUARDED_VAR = 0; |
| 134 | 136 |
| 135 int* pt_protected_by_lock_ PT_GUARDED_BY(pt_lock_); | 137 int* pt_protected_by_lock_ RTC_PT_GUARDED_BY(pt_lock_); |
| 136 int* pt_protected_by_anything_ PT_GUARDED_VAR; | 138 int* pt_protected_by_anything_ RTC_PT_GUARDED_VAR; |
| 137 }; | 139 }; |
| 138 | 140 |
| 139 } // namespace | 141 } // namespace |
| 140 | 142 |
| 141 TEST(ThreadAnnotationsTest, Test) { | 143 TEST(ThreadAnnotationsTest, Test) { |
| 142 // This test ensure thread annotations doesn't break compilation. | 144 // This test ensure thread annotations doesn't break compilation. |
| 143 // Thus no run-time expectations. | 145 // Thus no run-time expectations. |
| 144 ThreadSafe t; | 146 ThreadSafe t; |
| 145 t.LockInOrder(); | 147 t.LockInOrder(); |
| 146 t.UnprotectedFunction(); | 148 t.UnprotectedFunction(); |
| 147 t.ReadProtected(); | 149 t.ReadProtected(); |
| 148 t.WriteProtected(); | 150 t.WriteProtected(); |
| 149 t.CallReadProtectedFunction(); | 151 t.CallReadProtectedFunction(); |
| 150 t.CallWriteProtectedFunction(); | 152 t.CallWriteProtectedFunction(); |
| 151 } | 153 } |
| OLD | NEW |