Bug fix 3.2/fix thread shutdown (#7732)

jsteemann · web-flow · commit c1e3fcaf3085 · 2018-12-12T09:35:03.000+01:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,12 @@
 v3.2.18 (XXXX-XX-XX)
 --------------------
 
+* fix thread shutdown in _WIN32 builds
+
+  Previous versions used a wrong comparison logic to determine the current
+  thread id when shutting down a thread, leading to threads hanging in their
+  destructors on thread shutdown
+
 * fixed TypeError being thrown instead of validation errors when Foxx manifest
   validation fails
 
diff --git a/lib/Basics/threads-win32.cpp b/lib/Basics/threads-win32.cpp
@@ -101,6 +101,7 @@ bool TRI_StartThread(TRI_thread_t* thread, TRI_tid_t* threadId,
 ////////////////////////////////////////////////////////////////////////////////
 
 int TRI_JoinThread(TRI_thread_t* thread) {
+  TRI_ASSERT(thread != nullptr);
   DWORD result = WaitForSingleObject(*thread, INFINITE);
 
   switch (result) {
@@ -136,7 +137,8 @@ int TRI_JoinThread(TRI_thread_t* thread) {
 int TRI_DetachThread(TRI_thread_t* thread) {
   // If the function succeeds, the return value is nonzero.
   // If the function fails, the return value is zero. To get extended error information, call GetLastError. 
-  BOOL res = CloseHandle(thread);
+  TRI_ASSERT(thread != nullptr);
+  BOOL res = CloseHandle(*thread);
 
   if (res == 0) { 
     DWORD result = GetLastError();
@@ -157,7 +159,8 @@ bool TRI_IsSelfThread(TRI_thread_t* thread) {
   // TODO: Change the TRI_thread_t into a structure which stores the thread id
   // as well as the thread handle. This can then be passed around
   // ...........................................................................
-  return (GetCurrentThreadId() == GetThreadId(thread));
+  TRI_ASSERT(thread != nullptr);
+  return (GetCurrentThreadId() == GetThreadId(*thread));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
