DRD: handle fork() in processes with detached threads correctly (see also #255355).
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11532 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/drd/drd_thread.c b/drd/drd_thread.c
index f85a5b0..a31531e 100644
--- a/drd/drd_thread.c
+++ b/drd/drd_thread.c
@@ -367,7 +367,7 @@
DRD_(thread_get_stack_max)(drd_joinee));
}
DRD_(clientobj_delete_thread)(drd_joinee);
- DRD_(thread_delete)(drd_joinee);
+ DRD_(thread_delete)(drd_joinee, False);
}
/**
@@ -450,7 +450,7 @@
* Clean up thread-specific data structures. Call this just after
* pthread_join().
*/
-void DRD_(thread_delete)(const DrdThreadId tid)
+void DRD_(thread_delete)(const DrdThreadId tid, const Bool detached)
{
Segment* sg;
Segment* sg_prev;
@@ -467,7 +467,10 @@
}
DRD_(g_threadinfo)[tid].vg_thread_exists = False;
DRD_(g_threadinfo)[tid].posix_thread_exists = False;
- tl_assert(DRD_(g_threadinfo)[tid].detached_posix_thread == False);
+ if (detached)
+ DRD_(g_threadinfo)[tid].detached_posix_thread = False;
+ else
+ tl_assert(!DRD_(g_threadinfo)[tid].detached_posix_thread);
DRD_(g_threadinfo)[tid].first = 0;
DRD_(g_threadinfo)[tid].last = 0;
@@ -514,7 +517,7 @@
if (i == tid)
continue;
if (DRD_(IsValidDrdThreadId(i)))
- DRD_(thread_delete)(i);
+ DRD_(thread_delete)(i, True);
tl_assert(!DRD_(IsValidDrdThreadId(i)));
}
}