diff options
| author | wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-10-22 18:41:17 +0000 |
|---|---|---|
| committer | wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-10-22 18:41:17 +0000 |
| commit | 4d7116be7ab8f0631f2e4cac1d5f56c494627056 (patch) | |
| tree | 5c8d0fae351049b6cedb61ea25f168fcffefe4fd /tools | |
| parent | 90d8719fd7169831aacb426af8917f3cc600e12d (diff) | |
| download | webrtc-4d7116be7ab8f0631f2e4cac1d5f56c494627056.tar.gz | |
Fix tsan failures on filevideocapturer.cc.
1) init start_time_ns_ before the file_read_thread_ is started to avoid data racing as the start_time_ns_ will also be read by the file_read_thread_.
2) add CriticalSection to protect |finished_| that is accessed by FileReadThread and the main thread
Also remove the suppression for filemediaengine.cc, which has already been fixed in other cl.
TBR=henrike@webrtc.org
TEST=try bots and manual tsan v2 test
BUG=2078
Review URL: https://webrtc-codereview.appspot.com/2509004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@5018 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/valgrind-webrtc/tsan_v2/suppressions.txt | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/tools/valgrind-webrtc/tsan_v2/suppressions.txt b/tools/valgrind-webrtc/tsan_v2/suppressions.txt index ce981080f4..54ea84e38b 100644 --- a/tools/valgrind-webrtc/tsan_v2/suppressions.txt +++ b/tools/valgrind-webrtc/tsan_v2/suppressions.txt @@ -15,11 +15,6 @@ race:webrtc/modules/audio_processing/aec/aec_rdft.c # See https://code.google.com/p/webrtc/issues/detail?id=1205 race:talk/app/webrtc/test/fakeaudiocapturemodule.cc -# libjingle_media_unittest -# See https://code.google.com/p/webrtc/issues/detail?id=2078 -race:talk/media/base/filemediaengine.cc -race:talk/media/devices/filevideocapturer.cc - # libjingle_p2p_unittest # See https://code.google.com/p/webrtc/issues/detail?id=2079 race:talk/base/messagequeue.cc |