Skip to content

Commit 8d0d8b5

Browse files
committed
Revert "Fixing issue when setting up the number of stock GC threads - it should be 0 when using MMTk"
This reverts commit e591ad8.
1 parent d0cbd13 commit 8d0d8b5

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

src/mmtk-gc.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -350,9 +350,6 @@ void jl_gc_init(void)
350350
max_heap_size = uv_get_free_memory() * 70 / 100;
351351
}
352352

353-
// when using mmtk, we don't spawn any stock GC thread
354-
// and mmtk should use jl_options.ngcthreads to set the number of workers
355-
assert(jl_n_gcthreads == 0);
356353

357354
// Check that the julia_copy_stack rust feature has been defined when the COPY_STACK has been defined
358355
int copy_stacks;

src/threading.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -694,12 +694,6 @@ void jl_init_threading(void)
694694
}
695695
int16_t ngcthreads = jl_n_markthreads + jl_n_sweepthreads;
696696

697-
#ifdef MMTK_GC
698-
// MMTk gets the number of GC threads from jl_options.ngcthreads, and spawn its GC threads.
699-
// So we just set ngcthreads to 0 here to avoid spawning any GC threads in Julia.
700-
ngcthreads = 0;
701-
#endif
702-
703697
jl_all_tls_states_size = nthreads + nthreadsi + ngcthreads;
704698
jl_n_threads_per_pool = (int*)malloc_s(2 * sizeof(int));
705699
jl_n_threads_per_pool[0] = nthreadsi;
@@ -717,6 +711,11 @@ void jl_start_threads(void)
717711
{
718712
int nthreads = jl_atomic_load_relaxed(&jl_n_threads);
719713
int ngcthreads = jl_n_gcthreads;
714+
#ifdef MMTK_GC
715+
// MMTk gets the number of GC threads from jl_options.ngcthreads, and spawn its GC threads.
716+
// So we just set ngcthreads to 0 here to avoid spawning any GC threads in Julia.
717+
ngcthreads = 0;
718+
#endif
720719
int cpumasksize = uv_cpumask_size();
721720
char *cp;
722721
int i, exclusive;

0 commit comments

Comments
 (0)