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

Use an identity hash instead of array for stress_to_class

Browse Source
This commit is contained in:
Peter Zhu 2025-01-29 10:38:11 -05:00
parent 5e644e80e9
commit de45755de8
Notes: git 2025-01-29 18:22:21 +00:00 
Merged: https://github.com/ruby/ruby/pull/12664
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gc/default/default.c
View File

@ -283,7 +283,7 @@ int ruby_rgengc_debug;
#endif #endif
#ifndef GC_DEBUG_STRESS_TO_CLASS #ifndef GC_DEBUG_STRESS_TO_CLASS
# define GC_DEBUG_STRESS_TO_CLASS RUBY_DEBUG # define GC_DEBUG_STRESS_TO_CLASS 1
#endif #endif
typedef enum { typedef enum {
@ -2517,9 +2517,8 @@ rb_gc_impl_new_obj(void *objspace_ptr, void *cache_ptr, VALUE klass, VALUE flags
(void)RB_DEBUG_COUNTER_INC_IF(obj_newobj_wb_unprotected, !wb_protected); (void)RB_DEBUG_COUNTER_INC_IF(obj_newobj_wb_unprotected, !wb_protected);
if (RB_UNLIKELY(stress_to_class)) { if (RB_UNLIKELY(stress_to_class)) {
long cnt = RARRAY_LEN(stress_to_class); if (RTEST(rb_hash_has_key(stress_to_class, klass))) {
for (long i = 0; i < cnt; i++) { rb_memerror();
if (klass == RARRAY_AREF(stress_to_class, i)) rb_memerror();
} }
} }
@ -9328,9 +9327,13 @@ rb_gcdebug_add_stress_to_class(int argc, VALUE *argv, VALUE self)
rb_objspace_t *objspace = rb_gc_get_objspace(); rb_objspace_t *objspace = rb_gc_get_objspace();
if (!stress_to_class) { if (!stress_to_class) {
set_stress_to_class(rb_ary_hidden_new(argc)); set_stress_to_class(rb_ident_hash_new_with_size(argc));
}
for (int i = 0; i < argc; i++) {
VALUE klass = argv[i];
rb_hash_aset(stress_to_class, klass, Qtrue);
} }
rb_ary_cat(stress_to_class, argv, argc);
return self; return self;
} }
@ -9347,14 +9350,14 @@ static VALUE
rb_gcdebug_remove_stress_to_class(int argc, VALUE *argv, VALUE self) rb_gcdebug_remove_stress_to_class(int argc, VALUE *argv, VALUE self)
{ {
rb_objspace_t *objspace = rb_gc_get_objspace(); rb_objspace_t *objspace = rb_gc_get_objspace();
int i;
if (stress_to_class) { if (stress_to_class) {
for (i = 0; i < argc; ++i) { for (int i = 0; i < argc; ++i) {
rb_ary_delete_same(stress_to_class, argv[i]); rb_hash_delete(stress_to_class, argv[i]);
} }
if (RARRAY_LEN(stress_to_class) == 0) {
set_stress_to_class(0); if (rb_hash_size(stress_to_class) == 0) {
stress_to_class = 0;
} }
} }