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

Unified Diff: remoting/jingle_glue/jingle_thread.cc

Issue 3269005: Fixed tsan warnings in remoting_unittests (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: - Created 10 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tools/valgrind/tsan/ignores.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/jingle_glue/jingle_thread.cc
diff --git a/remoting/jingle_glue/jingle_thread.cc b/remoting/jingle_glue/jingle_thread.cc
index 00370668acb38e22b7ff689f2ab12b4601beaf7f..f13477ec73901d97cb0ec8509ad647b266f7d325 100644
--- a/remoting/jingle_glue/jingle_thread.cc
+++ b/remoting/jingle_glue/jingle_thread.cc
@@ -92,6 +92,9 @@ void JingleThread::Stop() {
// queue before exiting. Thread::Stop() would not do that.
Post(this, kStopMessageId);
stopped_event_.Wait();
+
+ // This will wait until the thread is actually finished.
+ Thread::Stop();
}
MessageLoop* JingleThread::message_loop() {
« no previous file with comments | « no previous file | tools/valgrind/tsan/ignores.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698