Skip to content

Ask from binding if GC is disabled #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 7, 2024
Merged

Ask from binding if GC is disabled #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4792b73
Removing functions to call mmtk's enable and disable collection
udesou Feb 1, 2024
4e057c9
Forgot a few other places
udesou Feb 1, 2024
1348e50
Missing reference in thread initialization
udesou Feb 1, 2024
125d05e
Exporting jl_gc_disable_counter
udesou Feb 1, 2024
99aa5dd
Exporting jl_gc_disable_counter
udesou Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/gc-common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ void gc_premark(jl_ptls_t ptls2)
// GC control
// ---

_Atomic(uint32_t) jl_gc_disable_counter = 1;
JL_DLLEXPORT _Atomic(uint32_t) jl_gc_disable_counter = 1;

JL_DLLEXPORT int jl_gc_enable(int on)
{
Expand All @@ -588,11 +588,9 @@ JL_DLLEXPORT int jl_gc_enable(int on)
if (jl_atomic_fetch_add(&jl_gc_disable_counter, -1) == 1) {
gc_num.allocd += gc_num.deferred_alloc;
gc_num.deferred_alloc = 0;
enable_collection();
}
}
else if (prev && !on) {
disable_collection();
// enable -> disable
jl_atomic_fetch_add(&jl_gc_disable_counter, 1);
// check if the GC is running and wait for it to finish
Expand Down
6 changes: 0 additions & 6 deletions src/gc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3438,12 +3438,6 @@ void jl_gc_threadfun(void *arg)
}

// added for MMTk integration
void enable_collection(void)
{
}
void disable_collection(void)
{
}

JL_DLLEXPORT void jl_gc_wb1_noinline(const void *parent) JL_NOTSAFEPOINT
{
Expand Down
2 changes: 1 addition & 1 deletion src/gc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ extern const size_t max_collect_interval;
extern size_t last_long_collect_interval;
extern size_t total_mem;
extern memsize_t max_total_memory;
extern _Atomic(uint32_t) jl_gc_disable_counter;
extern JL_DLLEXPORT _Atomic(uint32_t) jl_gc_disable_counter;
extern jl_mutex_t heapsnapshot_lock;
extern uint64_t finalizer_rngState[];
extern int gc_n_threads;
Expand Down
4 changes: 1 addition & 3 deletions src/julia_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,8 +333,6 @@ extern jl_array_t *jl_all_methods JL_GLOBALLY_ROOTED;
JL_DLLEXPORT extern int jl_lineno;
JL_DLLEXPORT extern const char *jl_filename;

extern void enable_collection(void);
extern void disable_collection(void);
jl_value_t *jl_gc_pool_alloc_noinline(jl_ptls_t ptls, int pool_offset,
int osize);
jl_value_t *jl_gc_big_alloc_noinline(jl_ptls_t ptls, size_t allocsz);
Expand Down Expand Up @@ -938,7 +936,7 @@ STATIC_INLINE int jl_addr_is_safepoint(uintptr_t addr)
return addr >= safepoint_addr && addr < safepoint_addr + jl_page_size * 3;
}
extern _Atomic(uint32_t) jl_gc_running;
extern _Atomic(uint32_t) jl_gc_disable_counter;
extern JL_DLLEXPORT _Atomic(uint32_t) jl_gc_disable_counter;
// All the functions are safe to be called from within a signal handler
// provided that the thread will not be interrupted by another asynchronous
// signal.
Expand Down
10 changes: 1 addition & 9 deletions src/mmtk-gc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ JL_DLLEXPORT void jl_gc_collect(jl_gc_collection_t collection)
{
jl_task_t *ct = jl_current_task;
jl_ptls_t ptls = ct->ptls;
if (jl_atomic_load_relaxed(&jl_gc_disable_counter)) {
if (jl_atomic_load_acquire(&jl_gc_disable_counter)) {
size_t localbytes = jl_atomic_load_relaxed(&ptls->gc_num.allocd) + gc_num.interval;
jl_atomic_store_relaxed(&ptls->gc_num.allocd, -(int64_t)gc_num.interval);
static_assert(sizeof(_Atomic(uint64_t)) == sizeof(gc_num.deferred_alloc), "");
Expand Down Expand Up @@ -503,14 +503,6 @@ void jl_gc_threadfun(void *arg)
}

// added for MMTk integration
void enable_collection(void)
{
mmtk_enable_collection();
}
void disable_collection(void)
{
mmtk_disable_collection();
}

JL_DLLEXPORT void jl_gc_array_ptr_copy(jl_array_t *dest, void **dest_p, jl_array_t *src, void **src_p, ssize_t n) JL_NOTSAFEPOINT
{
Expand Down
3 changes: 0 additions & 3 deletions src/threading.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,9 +351,6 @@ jl_ptls_t jl_init_threadtls(int16_t tid)
ptls->rngseed = jl_rand();
if (tid == 0) {
ptls->disable_gc = 1;
#ifdef MMTK_GC
disable_collection();
#endif
}
#ifdef _OS_WINDOWS_
if (tid == 0) {
Expand Down