Fix removal of dead threads in a child process

GC_threads table may contain several elements with the same pthread id,
so GC_remove_all_threads_but_me should remove all elements except for
the first found element matching the id of the current thread.

* pthread_support.c [CAN_HANDLE_FORK] (GC_remove_all_threads_but_me):
Do not assign me if it is already non-null; add comment.
* win32_threads.c [CAN_HANDLE_FORK] (GC_remove_all_threads_but_me):
Likewise.
* win32_threads.c [CAN_HANDLE_FORK] (GC_remove_all_threads_but_me):
Remove GC_ASSERT(me==NULL).

diff --git a/pthread_support.c b/pthread_support.c
index 5497a952cda596a4f2559b68c4df4e09d8bef637..1ead8cc6537892e5734e4093212b8a3ff38321d6 100644 (file)
--- a/pthread_support.c
+++ b/pthread_support.c
@@ -636,7 +636,8 @@ STATIC void GC_remove_all_threads_but_me(void)
       me = 0;
       for (p = GC_threads[hv]; 0 != p; p = next) {
         next = p -> next;
-        if (THREAD_EQUAL(p -> id, self)) {
+        if (THREAD_EQUAL(p -> id, self)
+            && me == NULL) { /* ignore dead threads with the same id */
           me = p;
           p -> next = 0;
 #         ifdef GC_DARWIN_THREADS

diff --git a/win32_threads.c b/win32_threads.c
index 41eca3c6fcd73ede90e7407566660c4251d21080..40c824e69b2de0987be3c1e5e68ba308e7c6da20 100644 (file)
--- a/win32_threads.c
+++ b/win32_threads.c
@@ -986,8 +986,8 @@ GC_API void * GC_CALL GC_call_with_gc_active(GC_fn_type fn,
       for (hv = 0; hv < THREAD_TABLE_SZ; ++hv) {
         for (p = GC_threads[hv]; 0 != p; p = next) {
           next = p -> tm.next;
-          if (THREAD_EQUAL(p -> pthread_id, pthread_id)) {
-            GC_ASSERT(me == NULL);
+          if (THREAD_EQUAL(p -> pthread_id, pthread_id)
+              && me == NULL) { /* ignore dead threads with the same id */
             me = p;
             p -> tm.next = 0;
           } else {