summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHParker <HParker@github.com>2023-12-19 21:12:18 -0800
committerYusuke Endoh <mame@ruby-lang.org>2023-12-20 14:36:32 +0900
commit7ef90b3978dad057ad6360a94d2d64e8ca5e9c38 (patch)
treecca84ec0c1dbd87b3df8112e7abe6be507da794b
parent7dca6b53a995a9782026f726c291344b5b8e0ab2 (diff)
Correct free_on_exit env var to free_at_exit
-rw-r--r--gc.c2
-rw-r--r--internal/vm.h2
-rw-r--r--ruby.c6
-rw-r--r--test/ruby/test_rubyoptions.rb6
-rw-r--r--vm.c6
5 files changed, 11 insertions, 11 deletions
diff --git a/gc.c b/gc.c
index 4a2e6f673b..b14550f88c 100644
--- a/gc.c
+++ b/gc.c
@@ -4699,7 +4699,7 @@ rb_objspace_call_finalizer(rb_objspace_t *objspace)
case T_NONE:
break;
default:
- if (rb_free_on_exit) {
+ if (rb_free_at_exit) {
obj_free(objspace, vp);
}
break;
diff --git a/internal/vm.h b/internal/vm.h
index f491b5e280..a32a14e045 100644
--- a/internal/vm.h
+++ b/internal/vm.h
@@ -83,7 +83,7 @@ void rb_check_stack_overflow(void);
extern uint64_t rb_vm_insns_count;
#endif
-extern bool rb_free_on_exit;
+extern bool rb_free_at_exit;
/* miniinit.c and builtin.c */
void rb_free_loaded_builtin_table(void);
diff --git a/ruby.c b/ruby.c
index 2571edafc9..f14d4f1ee0 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1770,9 +1770,9 @@ ruby_opt_init(ruby_cmdline_options_t *opt)
"environment variables RUBY_GC_HEAP_%d_INIT_SLOTS");
}
- if (getenv("RUBY_FREE_ON_EXIT")) {
- rb_warn("Free on exit is experimental and may be unstable");
- rb_free_on_exit = true;
+ if (getenv("RUBY_FREE_AT_EXIT")) {
+ rb_warn("Free at exit is experimental and may be unstable");
+ rb_free_at_exit = true;
}
#if USE_RJIT
diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
index 8118d59118..38ca119a8f 100644
--- a/test/ruby/test_rubyoptions.rb
+++ b/test/ruby/test_rubyoptions.rb
@@ -1241,9 +1241,9 @@ class TestRubyOptions < Test::Unit::TestCase
assert_in_out_err([IO::NULL], success: true)
end
- def test_free_on_exit_env_var
- env = {"RUBY_FREE_ON_EXIT"=>"1"}
+ def test_free_at_exit_env_var
+ env = {"RUBY_FREE_AT_EXIT"=>"1"}
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
diff --git a/vm.c b/vm.c
index 1b03950340..d2ec9a7f53 100644
--- a/vm.c
+++ b/vm.c
@@ -2993,7 +2993,7 @@ ruby_vm_destruct(rb_vm_t *vm)
if (vm) {
rb_thread_t *th = vm->ractor.main_thread;
VALUE *stack = th->ec->vm_stack;
- if (rb_free_on_exit) {
+ if (rb_free_at_exit) {
rb_free_default_rand_key();
rb_free_encoded_insn_data();
rb_free_global_enc_table();
@@ -3053,7 +3053,7 @@ ruby_vm_destruct(rb_vm_t *vm)
}
RB_ALTSTACK_FREE(vm->main_altstack);
if (objspace) {
- if (rb_free_on_exit) {
+ if (rb_free_at_exit) {
rb_objspace_free_objects(objspace);
rb_free_generic_iv_tbl_();
if (th) {
@@ -4273,7 +4273,7 @@ rb_ruby_debug_ptr(void)
return &cr->debug;
}
-bool rb_free_on_exit = false;
+bool rb_free_at_exit = false;
/* iseq.c */
VALUE rb_insn_operand_intern(const rb_iseq_t *iseq,