create phantom task for GC threads (JuliaLang#53815)

fingolfin · May 27, 2024 · e329688 · e329688
1 parent 54614fd
commit e329688
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/partr.c b/src/partr.c
@@ -122,6 +122,12 @@ void jl_gc_mark_threadfun(void *arg)
     // initialize this thread (set tid and create heap)
     jl_ptls_t ptls = jl_init_threadtls(targ->tid);
 
+    void *stack_lo, *stack_hi;
+    jl_init_stack_limits(0, &stack_lo, &stack_hi);
+    // warning: this changes `jl_current_task`, so be careful not to call that from this function
+    jl_task_t *ct = jl_init_root_task(ptls, stack_lo, stack_hi);
+    JL_GC_PROMISE_ROOTED(ct);
+
     // wait for all threads
     jl_gc_state_set(ptls, JL_GC_STATE_WAITING, 0);
     uv_barrier_wait(targ->barrier);
@@ -147,6 +153,12 @@ void jl_gc_sweep_threadfun(void *arg)
     // initialize this thread (set tid and create heap)
     jl_ptls_t ptls = jl_init_threadtls(targ->tid);
 
+    void *stack_lo, *stack_hi;
+    jl_init_stack_limits(0, &stack_lo, &stack_hi);
+    // warning: this changes `jl_current_task`, so be careful not to call that from this function
+    jl_task_t *ct = jl_init_root_task(ptls, stack_lo, stack_hi);
+    JL_GC_PROMISE_ROOTED(ct);
+
     // wait for all threads
     jl_gc_state_set(ptls, JL_GC_STATE_WAITING, 0);
     uv_barrier_wait(targ->barrier);

diff --git a/src/task.c b/src/task.c
@@ -1685,6 +1685,7 @@ jl_task_t *jl_init_root_task(jl_ptls_t ptls, void *stack_lo, void *stack_hi)
     JL_GC_PROMISE_ROOTED(ct);
     jl_set_pgcstack(&ct->gcstack);
     assert(jl_current_task == ct);
+    assert(jl_current_task->ptls == ptls);
 
 #ifdef _COMPILER_TSAN_ENABLED_
     ct->ctx.tsan_state = __tsan_get_current_fiber();