Fix pthread_join to avoid thread removal on failure (Cygwin, winpthreads)

* win32_threads.c [GC_WIN32_PTHREADS] (GC_pthread_join): Do not call
GC_lookup_pthread if pthread_join failed.
* win32_threads.c [GC_PTHREADS] (GC_pthread_join): Do not call
GC_delete_gc_thread_no_free, GC_INTERNAL_FREE if pthread_join failed.
* win32_threads.c [GC_PTHREADS && DEBUG_THREADS] (GC_pthread_join):
Log whether pthread_join succeeded or failed.

diff --git a/win32_threads.c b/win32_threads.c
index 30f39a87c0bb4f06f24eb032651c702071b1435f..282234713cdba8f6eb27cf87a9f14199d04cb83f 100644 (file)
--- a/win32_threads.c
+++ b/win32_threads.c
@@ -2545,24 +2545,27 @@ GC_INNER void GC_thr_init(void)
 #   ifndef GC_WIN32_PTHREADS
       while ((t = GC_lookup_pthread(pthread_id)) == 0)
         Sleep(10);
-      result = pthread_join(pthread_id, retval);
-#   else
-      result = pthread_join(pthread_id, retval);
-      /* pthreads-win32 and winpthreads id are unique (not recycled). */
-      t = GC_lookup_pthread(pthread_id);
-      if (NULL == t) ABORT("Thread not registered");
 #   endif
+    result = pthread_join(pthread_id, retval);
+    if (0 == result) {
+#     ifdef GC_WIN32_PTHREADS
+        /* pthreads-win32 and winpthreads id are unique (not recycled). */
+        t = GC_lookup_pthread(pthread_id);
+        if (NULL == t) ABORT("Thread not registered");
+#     endif
 
-    LOCK();
-    GC_delete_gc_thread_no_free(t);
-    GC_INTERNAL_FREE(t);
-    UNLOCK();
+      LOCK();
+        GC_delete_gc_thread_no_free(t);
+        GC_INTERNAL_FREE(t);
+      UNLOCK();
+    }
 
 #   ifdef DEBUG_THREADS
-      GC_log_printf("thread %p(0x%lx) completed join with thread %p\n",
+      GC_log_printf("thread %p(0x%lx) join with thread %p %s\n",
                     (void *)GC_PTHREAD_PTRVAL(pthread_self()),
                     (long)GetCurrentThreadId(),
-                    (void *)GC_PTHREAD_PTRVAL(pthread_id));
+                    (void *)GC_PTHREAD_PTRVAL(pthread_id),
+                    result != 0 ? "failed" : "succeeded");
 #   endif
     return result;
   }