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

Side by Side Diff: webrtc/base/asyncinvoker-inl.h

Issue 2885143006: Fixing potential AsyncInvoker deadlock that occurs for "reentrant" invocations. (Closed)
Patch Set: Addressing TSan race warning Created 3 years, 7 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
« no previous file with comments | « webrtc/base/asyncinvoker.cc ('k') | webrtc/base/thread_unittest.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 2014 The WebRTC Project Authors. All rights reserved. 2 * Copyright 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 #ifndef WEBRTC_BASE_ASYNCINVOKER_INL_H_ 11 #ifndef WEBRTC_BASE_ASYNCINVOKER_INL_H_
12 #define WEBRTC_BASE_ASYNCINVOKER_INL_H_ 12 #define WEBRTC_BASE_ASYNCINVOKER_INL_H_
13 13
14 #include "webrtc/base/atomicops.h" 14 #include "webrtc/base/atomicops.h"
15 #include "webrtc/base/bind.h" 15 #include "webrtc/base/bind.h"
16 #include "webrtc/base/criticalsection.h" 16 #include "webrtc/base/criticalsection.h"
17 #include "webrtc/base/messagehandler.h" 17 #include "webrtc/base/messagehandler.h"
18 #include "webrtc/base/sigslot.h" 18 #include "webrtc/base/sigslot.h"
19 #include "webrtc/base/thread.h" 19 #include "webrtc/base/thread.h"
20 #include "webrtc/base/thread_annotations.h" 20 #include "webrtc/base/thread_annotations.h"
21 21
22 namespace rtc { 22 namespace rtc {
23 23
24 class AsyncInvoker; 24 class AsyncInvoker;
25 25
26 // Helper class for AsyncInvoker. Runs a task and triggers a callback 26 // Helper class for AsyncInvoker. Runs a task and triggers a callback
27 // on the calling thread if necessary. 27 // on the calling thread if necessary.
28 class AsyncClosure { 28 class AsyncClosure {
29 public: 29 public:
30 explicit AsyncClosure(AsyncInvoker* invoker) : invoker_(invoker) {} 30 explicit AsyncClosure(AsyncInvoker* invoker);
31 virtual ~AsyncClosure(); 31 virtual ~AsyncClosure();
32 // Runs the asynchronous task, and triggers a callback to the calling 32 // Runs the asynchronous task, and triggers a callback to the calling
33 // thread if needed. Should be called from the target thread. 33 // thread if needed. Should be called from the target thread.
34 virtual void Execute() = 0; 34 virtual void Execute() = 0;
35 35
36 protected: 36 protected:
37 AsyncInvoker* invoker_; 37 AsyncInvoker* invoker_;
38 }; 38 };
39 39
40 // Simple closure that doesn't trigger a callback for the calling thread. 40 // Simple closure that doesn't trigger a callback for the calling thread.
41 template <class FunctorT> 41 template <class FunctorT>
42 class FireAndForgetAsyncClosure : public AsyncClosure { 42 class FireAndForgetAsyncClosure : public AsyncClosure {
43 public: 43 public:
44 explicit FireAndForgetAsyncClosure(AsyncInvoker* invoker, 44 explicit FireAndForgetAsyncClosure(AsyncInvoker* invoker,
45 const FunctorT& functor) 45 const FunctorT& functor)
46 : AsyncClosure(invoker), functor_(functor) {} 46 : AsyncClosure(invoker), functor_(functor) {}
47 virtual void Execute() { 47 virtual void Execute() {
48 functor_(); 48 functor_();
49 } 49 }
50 private: 50 private:
51 FunctorT functor_; 51 FunctorT functor_;
52 }; 52 };
53 53
54 } // namespace rtc 54 } // namespace rtc
55 55
56 #endif // WEBRTC_BASE_ASYNCINVOKER_INL_H_ 56 #endif // WEBRTC_BASE_ASYNCINVOKER_INL_H_
OLDNEW
« no previous file with comments | « webrtc/base/asyncinvoker.cc ('k') | webrtc/base/thread_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698