From 11c5db01af2a173e50f9783d445c74161a3c8a2a Mon Sep 17 00:00:00 2001 From: "tommi@webrtc.org" Date: Mon, 9 Feb 2015 16:31:31 +0000 Subject: [PATCH] Revert 8273 "Temporarily change ThreadPosix to CHECK (crash) if ..." > 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 TBR=tommi@webrtc.org Review URL: https://webrtc-codereview.appspot.com/38039004 Cr-Commit-Position: refs/heads/master@{#8300} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8300 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/system_wrappers/source/thread_posix.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/webrtc/system_wrappers/source/thread_posix.cc b/webrtc/system_wrappers/source/thread_posix.cc index 0341338ab..fe928ef50 100644 --- a/webrtc/system_wrappers/source/thread_posix.cc +++ b/webrtc/system_wrappers/source/thread_posix.cc @@ -110,10 +110,7 @@ bool ThreadPosix::Start(unsigned int& thread_id) { if (result != 0) return false; - // 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); + CHECK_EQ(kEventSignaled, params.started->Wait(WEBRTC_EVENT_INFINITE)); DCHECK_NE(thread_id_, 0); thread_id = thread_id_;