| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2014 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 // Borrowed from Chromium's src/base/threading/thread_checker.h. | 11 // Borrowed from Chromium's src/base/threading/thread_checker.h. |
| 12 | 12 |
| 13 #ifndef WEBRTC_BASE_THREAD_CHECKER_H_ | 13 #ifndef WEBRTC_BASE_THREAD_CHECKER_H_ |
| 14 #define WEBRTC_BASE_THREAD_CHECKER_H_ | 14 #define WEBRTC_BASE_THREAD_CHECKER_H_ |
| 15 | 15 |
| 16 // Apart from debug builds, we also enable the thread checker in | 16 // Apart from debug builds, we also enable the thread checker in |
| 17 // builds with DCHECK_ALWAYS_ON so that trybots and waterfall bots | 17 // builds with DCHECK_ALWAYS_ON so that trybots and waterfall bots |
| 18 // with this define will get the same level of thread checking as | 18 // with this define will get the same level of thread checking as |
| 19 // debug bots. | 19 // debug bots. |
| 20 // | 20 // |
| 21 // Note that this does not perfectly match situations where DCHECK is | 21 // Note that this does not perfectly match situations where RTC_DCHECK is |
| 22 // enabled. For example a non-official release build may have | 22 // enabled. For example a non-official release build may have |
| 23 // DCHECK_ALWAYS_ON undefined (and therefore ThreadChecker would be | 23 // DCHECK_ALWAYS_ON undefined (and therefore ThreadChecker would be |
| 24 // disabled) but have DCHECKs enabled at runtime. | 24 // disabled) but have RTC_DCHECKs enabled at runtime. |
| 25 #if (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)) | 25 #if (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)) |
| 26 #define ENABLE_THREAD_CHECKER 1 | 26 #define ENABLE_THREAD_CHECKER 1 |
| 27 #else | 27 #else |
| 28 #define ENABLE_THREAD_CHECKER 0 | 28 #define ENABLE_THREAD_CHECKER 0 |
| 29 #endif | 29 #endif |
| 30 | 30 |
| 31 #include "webrtc/base/thread_checker_impl.h" | 31 #include "webrtc/base/thread_checker_impl.h" |
| 32 | 32 |
| 33 namespace rtc { | 33 namespace rtc { |
| 34 | 34 |
| (...skipping 25 matching lines...) Expand all Loading... |
| 60 // - Derived classes should be able to reassign the base class to another | 60 // - Derived classes should be able to reassign the base class to another |
| 61 // thread, via DetachFromThread. | 61 // thread, via DetachFromThread. |
| 62 // | 62 // |
| 63 // If neither of these are true, then having a ThreadChecker member and calling | 63 // If neither of these are true, then having a ThreadChecker member and calling |
| 64 // CalledOnValidThread is the preferable solution. | 64 // CalledOnValidThread is the preferable solution. |
| 65 // | 65 // |
| 66 // Example: | 66 // Example: |
| 67 // class MyClass { | 67 // class MyClass { |
| 68 // public: | 68 // public: |
| 69 // void Foo() { | 69 // void Foo() { |
| 70 // DCHECK(thread_checker_.CalledOnValidThread()); | 70 // RTC_DCHECK(thread_checker_.CalledOnValidThread()); |
| 71 // ... (do stuff) ... | 71 // ... (do stuff) ... |
| 72 // } | 72 // } |
| 73 // | 73 // |
| 74 // private: | 74 // private: |
| 75 // ThreadChecker thread_checker_; | 75 // ThreadChecker thread_checker_; |
| 76 // } | 76 // } |
| 77 // | 77 // |
| 78 // In Release mode, CalledOnValidThread will always return true. | 78 // In Release mode, CalledOnValidThread will always return true. |
| 79 #if ENABLE_THREAD_CHECKER | 79 #if ENABLE_THREAD_CHECKER |
| 80 class ThreadChecker : public ThreadCheckerImpl { | 80 class ThreadChecker : public ThreadCheckerImpl { |
| 81 }; | 81 }; |
| 82 #else | 82 #else |
| 83 class ThreadChecker : public ThreadCheckerDoNothing { | 83 class ThreadChecker : public ThreadCheckerDoNothing { |
| 84 }; | 84 }; |
| 85 #endif // ENABLE_THREAD_CHECKER | 85 #endif // ENABLE_THREAD_CHECKER |
| 86 | 86 |
| 87 #undef ENABLE_THREAD_CHECKER | 87 #undef ENABLE_THREAD_CHECKER |
| 88 | 88 |
| 89 } // namespace rtc | 89 } // namespace rtc |
| 90 | 90 |
| 91 #endif // WEBRTC_BASE_THREAD_CHECKER_H_ | 91 #endif // WEBRTC_BASE_THREAD_CHECKER_H_ |
| OLD | NEW |