diff options
| author | Peter Zhu <[email protected]> | 2024-12-04 14:29:47 -0500 |
|---|---|---|
| committer | Peter Zhu <[email protected]> | 2024-12-05 10:33:26 -0500 |
| commit | ce1ad1b816f912d0750669c57211d72ea723e28d (patch) | |
| tree | 4e9a68feb302cfa5790a96ea8c551873ff1d36e5 /gc | |
| parent | 26ab20fec1d8ca7c168e8537383a0d8274a7d273 (diff) | |
Standardize on the name "modular GC"
We have name fragmentation for this feature, including "shared GC",
"modular GC", and "external GC". This commit standardizes the feature
name to "modular GC" and the implementation to "GC library".
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/12261
Diffstat (limited to 'gc')
| -rw-r--r-- | gc/default/default.c | 4 | ||||
| -rw-r--r-- | gc/extconf_base.rb | 2 | ||||
| -rw-r--r-- | gc/gc.h | 8 | ||||
| -rw-r--r-- | gc/gc_impl.h | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/gc/default/default.c b/gc/default/default.c index 3927a2e78c..b805df9983 100644 --- a/gc/default/default.c +++ b/gc/default/default.c @@ -29,7 +29,7 @@ #include "gc/gc.h" #include "gc/gc_impl.h" -#ifndef BUILDING_SHARED_GC +#ifndef BUILDING_MODULAR_GC # include "probes.h" #endif @@ -8466,7 +8466,7 @@ gc_prof_timer_stop(rb_objspace_t *objspace) } } -#ifdef BUILDING_SHARED_GC +#ifdef BUILDING_MODULAR_GC # define RUBY_DTRACE_GC_HOOK(name) #else # define RUBY_DTRACE_GC_HOOK(name) \ diff --git a/gc/extconf_base.rb b/gc/extconf_base.rb index 7ecbc184ac..0cbb09d5ea 100644 --- a/gc/extconf_base.rb +++ b/gc/extconf_base.rb @@ -5,7 +5,7 @@ require "mkmf" srcdir = File.join(__dir__, "..") $INCFLAGS << " -I#{srcdir}" -$CPPFLAGS << " -DBUILDING_SHARED_GC" +$CPPFLAGS << " -DBUILDING_MODULAR_GC" append_cflags("-fPIC") @@ -11,7 +11,7 @@ */ #include "ruby/ruby.h" -#if USE_SHARED_GC +#if USE_MODULAR_GC #include "ruby/thread_native.h" struct rb_gc_vm_context { @@ -70,7 +70,7 @@ size_t rb_obj_memsize_of(VALUE obj); void rb_gc_prepare_heap_process_object(VALUE obj); bool ruby_free_at_exit_p(void); -#if USE_SHARED_GC +#if USE_MODULAR_GC bool rb_gc_event_hook_required_p(rb_event_flag_t event); void *rb_gc_get_ractor_newobj_cache(void); void rb_gc_initialize_vm_context(struct rb_gc_vm_context *context); @@ -85,7 +85,7 @@ void rb_ractor_finish_marking(void); // -------------------Private section begin------------------------ // Functions in this section are private to the default GC and gc.c -#ifdef BUILDING_SHARED_GC +#ifdef BUILDING_MODULAR_GC RBIMPL_WARNING_PUSH() RBIMPL_WARNING_IGNORED(-Wunused-function) #endif @@ -222,7 +222,7 @@ type_sym(size_t type) } } -#ifdef BUILDING_SHARED_GC +#ifdef BUILDING_MODULAR_GC RBIMPL_WARNING_POP() #endif // -------------------Private section end------------------------ diff --git a/gc/gc_impl.h b/gc/gc_impl.h index af53823b6b..322ce2b15c 100644 --- a/gc/gc_impl.h +++ b/gc/gc_impl.h @@ -10,10 +10,10 @@ */ #include "ruby/ruby.h" -#ifdef BUILDING_SHARED_GC +#ifdef BUILDING_MODULAR_GC # define GC_IMPL_FN #else -// `GC_IMPL_FN` is an implementation detail of `!USE_SHARED_GC` builds +// `GC_IMPL_FN` is an implementation detail of `!USE_MODULAR_GC` builds // to have the default GC in the same translation unit as gc.c for // the sake of optimizer visibility. It expands to nothing unless // you're the default GC. |