Wait for threads to exit when destroying them.

Bug 19868861 Android does not support canceling threads, but we shouldn't forcefully destroy them anyway, and we already join() all threads before deleting them. So use the same semantics on all platforms and join redundantly. Change-Id: I888e2e64288cf3ac53d570d517f3e0867b8c479e Reviewed-on: https://swiftshader-review.googlesource.com/2667Tested-by: Nicolas Capens <capn@google.com> Reviewed-by: Greg Hartman <ghartman@google.com> Tested-by: Greg Hartman <ghartman@google.com> Reviewed-by: Nicolas Capens <capn@google.com>

Wait for threads to exit when destroying them.
7d168c45 · Nicolas Capens · 20288298 · 7d168c45
Commit 7d168c45 authored Mar 20, 2015 by Nicolas Capens
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 5 deletions

Thread.cpp src/Common/Thread.cpp +1 -5

No files found.
--- a/src/Common/Thread.cpp
+++ b/src/Common/Thread.cpp
@@ -29,11 +29,7 @@ namespace sw

 	Thread::~Thread()
 	{
-		#if defined(_WIN32)
-			CloseHandle(handle);
-		#else
-			pthread_cancel(handle);
-		#endif
+		join();   // Make threads exit before deleting them to not block here
 	}

 	void Thread::join()