Ensure GC initialized when atfork_prepare is called by client

Otherwise, if THREAD_LOCAL_ALLOC, GC_remove_all_threads_but_me would
not find the current thread descriptor in GC_threads.

* pthread_support.c [CAN_HANDLE_FORK] (GC_atfork_prepare): Call GC_init
if not GC_is_initialized.
* win32_threads.c [CAN_HANDLE_FORK] (GC_atfork_prepare): Likewise.

diff --git a/pthread_support.c b/pthread_support.c
index 6d66792e0f2906bbff1f0d84603cb287832169ac..e0a874224d5f9931c7763bf15abbd0d98df42e82 100644 (file)
--- a/pthread_support.c
+++ b/pthread_support.c
@@ -990,6 +990,7 @@ static void fork_child_proc(void)
   /* Routines for fork handling by client (no-op if pthread_atfork works). */
   GC_API void GC_CALL GC_atfork_prepare(void)
   {
+    if (!EXPECT(GC_is_initialized, TRUE)) GC_init();
 #   if defined(GC_DARWIN_THREADS) && defined(MPROTECT_VDB)
       if (GC_dirty_maintained) {
         GC_ASSERT(0 == GC_handle_fork);

diff --git a/win32_threads.c b/win32_threads.c
index e64a9fd1f16544c3257c29085e69533d32a728b8..7af26bd75ca2215f43f97fc0e100008f72cc29c1 100644 (file)
--- a/win32_threads.c
+++ b/win32_threads.c
@@ -1086,6 +1086,7 @@ GC_API void * GC_CALL GC_call_with_gc_active(GC_fn_type fn,
   /* Routines for fork handling by client (no-op if pthread_atfork works). */
   GC_API void GC_CALL GC_atfork_prepare(void)
   {
+    if (!EXPECT(GC_is_initialized, TRUE)) GC_init();
     if (GC_handle_fork <= 0)
       fork_prepare_proc();
   }