commit ccd7e99f0acc7ebf2d4bdda74edf665f1184f97d
author tommi@webrtc.org <tommi@webrtc.org> Fri Feb 06 19:26:42 2015 +0000
committer tommi@webrtc.org <tommi@webrtc.org> Fri Feb 06 19:27:12 2015 +0000
tree 9a9cc176b201ab36acc53038c205c621ad4c868b
parent 13a0e184eeb21d6dd68828f600d5886d7550fdf6

Temporarily change ThreadPosix to CHECK (crash) if we ever spend more than 30 seconds waiting for thread shutdown. There are cases on build bots where it looks like we're hitting this problem, but reproducing locally has been a struggle.

TBR=pbos@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/41799004

Cr-Commit-Position: refs/heads/master@{#8273}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8273 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/system_wrappers/source/thread_posix.cc

diff --git a/webrtc/system_wrappers/source/thread_posix.cc b/webrtc/system_wrappers/source/thread_posix.cc
index c2a8b38..4050c82 100644
--- a/webrtc/system_wrappers/source/thread_posix.cc
+++ b/webrtc/system_wrappers/source/thread_posix.cc
@@ -110,7 +110,10 @@
   if (result != 0)
     return false;
 
-  CHECK_EQ(kEventSignaled, params.started->Wait(WEBRTC_EVENT_INFINITE));
+  // TODO(tommi): Change the timeout back to WEBRTC_EVENT_INFINITE when we've
+  // figured out where we're seeing tests hang.
+  auto state = params.started->Wait(30 * 1000);
+  CHECK_EQ(kEventSignaled, state);
   DCHECK_NE(thread_id_, 0);
 
   thread_id = thread_id_;