1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correct free_on_exit env var to free_at_exit

Browse Source
This commit is contained in:
HParker 2023-12-19 21:12:18 -08:00 committed by Yusuke Endoh
parent 7dca6b53a9
commit 7ef90b3978
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gc.c
View File

@ -4699,7 +4699,7 @@ rb_objspace_call_finalizer(rb_objspace_t *objspace)
case T_NONE: case T_NONE:
break; break;
default: default:
if (rb_free_on_exit) { if (rb_free_at_exit) {
obj_free(objspace, vp); obj_free(objspace, vp);
} }
break; break;

2
internal/vm.h
View File

@ -83,7 +83,7 @@ void rb_check_stack_overflow(void);
extern uint64_t rb_vm_insns_count; extern uint64_t rb_vm_insns_count;
#endif #endif
extern bool rb_free_on_exit; extern bool rb_free_at_exit;
/* miniinit.c and builtin.c */ /* miniinit.c and builtin.c */
void rb_free_loaded_builtin_table(void); void rb_free_loaded_builtin_table(void);

6
ruby.c
View File

@ -1770,9 +1770,9 @@ ruby_opt_init(ruby_cmdline_options_t *opt)
"environment variables RUBY_GC_HEAP_%d_INIT_SLOTS"); "environment variables RUBY_GC_HEAP_%d_INIT_SLOTS");
} }
if (getenv("RUBY_FREE_ON_EXIT")) { if (getenv("RUBY_FREE_AT_EXIT")) {
rb_warn("Free on exit is experimental and may be unstable"); rb_warn("Free at exit is experimental and may be unstable");
rb_free_on_exit = true; rb_free_at_exit = true;
} }
#if USE_RJIT #if USE_RJIT

6
test/ruby/test_rubyoptions.rb
View File

@ -1241,9 +1241,9 @@ class TestRubyOptions < Test::Unit::TestCase
assert_in_out_err([IO::NULL], success: true) assert_in_out_err([IO::NULL], success: true)
end end
def test_free_on_exit_env_var def test_free_at_exit_env_var
env = {"RUBY_FREE_ON_EXIT"=>"1"} env = {"RUBY_FREE_AT_EXIT"=>"1"}
assert_ruby_status([env, "-e;"]) assert_ruby_status([env, "-e;"])
assert_in_out_err([env, "-W"], "", [], /Free on exit is experimental and may be unstable/) assert_in_out_err([env, "-W"], "", [], /Free at exit is experimental and may be unstable/)
end end
end end

6
vm.c
View File

@ -2993,7 +2993,7 @@ ruby_vm_destruct(rb_vm_t *vm)
if (vm) { if (vm) {
rb_thread_t *th = vm->ractor.main_thread; rb_thread_t *th = vm->ractor.main_thread;
VALUE *stack = th->ec->vm_stack; VALUE *stack = th->ec->vm_stack;
if (rb_free_on_exit) { if (rb_free_at_exit) {
rb_free_default_rand_key(); rb_free_default_rand_key();
rb_free_encoded_insn_data(); rb_free_encoded_insn_data();
rb_free_global_enc_table(); rb_free_global_enc_table();
@ -3053,7 +3053,7 @@ ruby_vm_destruct(rb_vm_t *vm)
} }
RB_ALTSTACK_FREE(vm->main_altstack); RB_ALTSTACK_FREE(vm->main_altstack);
if (objspace) { if (objspace) {
if (rb_free_on_exit) { if (rb_free_at_exit) {
rb_objspace_free_objects(objspace); rb_objspace_free_objects(objspace);
rb_free_generic_iv_tbl_(); rb_free_generic_iv_tbl_();
if (th) { if (th) {
@ -4273,7 +4273,7 @@ rb_ruby_debug_ptr(void)
return &cr->debug; return &cr->debug;
} }
bool rb_free_on_exit = false; bool rb_free_at_exit = false;
/* iseq.c */ /* iseq.c */
VALUE rb_insn_operand_intern(const rb_iseq_t *iseq, VALUE rb_insn_operand_intern(const rb_iseq_t *iseq,