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

Side by Side Diff: webrtc/base/criticalsection.h

Issue 1453093002: Revert of Create rtc::AtomicInt POD struct. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 1 month 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
« no previous file with comments | « webrtc/base/atomicops.h ('k') | webrtc/base/criticalsection.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 /* 1 /*
2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2004 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
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 }; 99 };
100 100
101 // A POD lock used to protect global variables. Do NOT use for other purposes. 101 // A POD lock used to protect global variables. Do NOT use for other purposes.
102 // No custom constructor or private data member should be added. 102 // No custom constructor or private data member should be added.
103 class LOCKABLE GlobalLockPod { 103 class LOCKABLE GlobalLockPod {
104 public: 104 public:
105 void Lock() EXCLUSIVE_LOCK_FUNCTION(); 105 void Lock() EXCLUSIVE_LOCK_FUNCTION();
106 106
107 void Unlock() UNLOCK_FUNCTION(); 107 void Unlock() UNLOCK_FUNCTION();
108 108
109 AtomicInt lock_acquired; 109 volatile int lock_acquired;
110 }; 110 };
111 111
112 class GlobalLock : public GlobalLockPod {}; 112 class GlobalLock : public GlobalLockPod {
113 public:
114 GlobalLock();
115 };
113 116
114 // GlobalLockScope, for serializing execution through a scope. 117 // GlobalLockScope, for serializing execution through a scope.
115 class SCOPED_LOCKABLE GlobalLockScope { 118 class SCOPED_LOCKABLE GlobalLockScope {
116 public: 119 public:
117 explicit GlobalLockScope(GlobalLockPod* lock) EXCLUSIVE_LOCK_FUNCTION(lock); 120 explicit GlobalLockScope(GlobalLockPod* lock) EXCLUSIVE_LOCK_FUNCTION(lock);
118 ~GlobalLockScope() UNLOCK_FUNCTION(); 121 ~GlobalLockScope() UNLOCK_FUNCTION();
119 private: 122 private:
120 GlobalLockPod* const lock_; 123 GlobalLockPod* const lock_;
121 RTC_DISALLOW_COPY_AND_ASSIGN(GlobalLockScope); 124 RTC_DISALLOW_COPY_AND_ASSIGN(GlobalLockScope);
122 }; 125 };
123 126
124 } // namespace rtc 127 } // namespace rtc
125 128
126 #endif // WEBRTC_BASE_CRITICALSECTION_H_ 129 #endif // WEBRTC_BASE_CRITICALSECTION_H_
OLDNEW
« no previous file with comments | « webrtc/base/atomicops.h ('k') | webrtc/base/criticalsection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698