diff options
| author | Peter Zhu <[email protected]> | 2023-11-03 08:53:50 -0400 |
|---|---|---|
| committer | Peter Zhu <[email protected]> | 2023-11-03 10:15:32 -0400 |
| commit | 1321df773b6316d2e88dfcada7844e00762d5a94 () | |
| tree | 85c38ca7ea7676b4bc47a3287ae8411084621865 /variable.c | |
| parent | ec86b2eb3947060cffbc95c7c236e110a269c7de (diff) | |
Use shape capacity transitions for generic ivars
This commit changes generic ivars to respect the capacity transition in shapes rather than growing the capacity independently.
| -rw-r--r-- | variable.c | 154 |
1 files changed, 63 insertions, 91 deletions
@@ -63,15 +63,6 @@ static void setup_const_entry(rb_const_entry_t *, VALUE, VALUE, rb_const_flag_t) static VALUE rb_const_search(VALUE klass, ID id, int exclude, int recurse, int visibility); static st_table *generic_iv_tbl_; -struct ivar_update { - struct gen_ivtbl *ivtbl; - uint32_t iv_index; - uint32_t max_index; -#if !SHAPE_IN_BASIC_FLAGS - rb_shape_t *shape; -#endif -}; - static inline st_table * RCLASS_IV_HASH(VALUE obj) { @@ -1042,19 +1033,6 @@ generic_ivtbl_no_ractor_check(VALUE obj) return generic_ivtbl(obj, 0, false); } -static int -gen_ivtbl_get_unlocked(VALUE obj, ID id, struct gen_ivtbl **ivtbl) -{ - st_data_t data; - - if (st_lookup(generic_ivtbl(obj, id, false), (st_data_t)obj, &data)) { - *ivtbl = (struct gen_ivtbl *)data; - return 1; - } - - return 0; -} - int rb_gen_ivtbl_get(VALUE obj, ID id, struct gen_ivtbl **ivtbl) { @@ -1103,32 +1081,6 @@ gen_ivtbl_resize(struct gen_ivtbl *old, uint32_t n) return ivtbl; } -static int -generic_ivar_update(st_data_t *k, st_data_t *v, st_data_t u, int existing) -{ - ASSERT_vm_locking(); - - struct ivar_update *ivup = (struct ivar_update *)u; - struct gen_ivtbl *ivtbl = 0; - - if (existing) { - ivtbl = (struct gen_ivtbl *)*v; - if (ivup->iv_index < ivtbl->as.shape.numiv) { - ivup->ivtbl = ivtbl; - return ST_STOP; - } - } - FL_SET((VALUE)*k, FL_EXIVAR); - ivtbl = gen_ivtbl_resize(ivtbl, ivup->max_index); - // Reinsert in to the hash table because ivtbl might be a newly resized chunk of memory - *v = (st_data_t)ivtbl; - ivup->ivtbl = ivtbl; -#if !SHAPE_IN_BASIC_FLAGS - ivtbl->shape_id = rb_shape_id(ivup->shape); -#endif - return ST_CONTINUE; -} - void rb_mark_and_update_generic_ivar(VALUE obj) { @@ -1270,7 +1222,6 @@ rb_ivar_lookup(VALUE obj, ID id, VALUE undef) } } else { - attr_index_t index = 0; shape = rb_shape_get_shape_by_id(shape_id); found = rb_shape_get_iv_index(shape, id, &index); @@ -1509,49 +1460,97 @@ rb_evict_ivars_to_hash(VALUE obj, rb_shape_t * shape) RUBY_ASSERT(rb_shape_obj_too_complex(obj)); } -static void -generic_ivar_set(VALUE obj, ID id, VALUE val) { - struct ivar_update ivup; - attr_index_t index; rb_shape_t *shape = rb_shape_get_shape(obj); if (UNLIKELY(shape->type == SHAPE_OBJ_TOO_COMPLEX)) { rb_complex_ivar_set(obj, id, val); return; } bool found = rb_shape_get_iv_index(shape, id, &index); - rb_shape_t *next_shape = shape; if (!found) { index = shape->next_iv_index; - next_shape = rb_shape_get_next(shape, obj, id); if (next_shape->type == SHAPE_OBJ_TOO_COMPLEX) { rb_evict_ivars_to_hash(obj, shape); rb_complex_ivar_set(obj, id, val); - rb_shape_set_shape(obj, next_shape); FL_SET_RAW(obj, FL_EXIVAR); return; } shape = next_shape; RUBY_ASSERT(index == (next_shape->next_iv_index - 1)); } - ivup.max_index = shape->next_iv_index; -#if !SHAPE_IN_BASIC_FLAGS - ivup.shape = shape; -#endif RB_VM_LOCK_ENTER(); { - ivup.iv_index = (uint32_t)index; - - st_update(generic_ivtbl(obj, id, false), (st_data_t)obj, generic_ivar_update, (st_data_t)&ivup); } RB_VM_LOCK_LEAVE(); - ivup.ivtbl->as.shape.ivptr[ivup.iv_index] = val; RB_OBJ_WRITTEN(obj, Qundef, val); if (!found) { @@ -1576,33 +1575,6 @@ rb_ensure_iv_list_size(VALUE obj, uint32_t current_capacity, uint32_t new_capaci } } -struct gen_ivtbl * -rb_ensure_generic_iv_list_size(VALUE obj, rb_shape_t *shape, uint32_t newsize) -{ - struct gen_ivtbl * ivtbl = 0; - - RB_VM_LOCK_ENTER(); - { - if (UNLIKELY(!gen_ivtbl_get_unlocked(obj, 0, &ivtbl) || newsize > ivtbl->as.shape.numiv)) { - struct ivar_update ivup = { - .iv_index = newsize - 1, - .max_index = newsize, -#if !SHAPE_IN_BASIC_FLAGS - .shape = shape -#endif - }; - st_update(generic_ivtbl_no_ractor_check(obj), (st_data_t)obj, generic_ivar_update, (st_data_t)&ivup); - ivtbl = ivup.ivtbl; - FL_SET_RAW(obj, FL_EXIVAR); - } - } - RB_VM_LOCK_LEAVE(); - - RUBY_ASSERT(ivtbl); - - return ivtbl; -} - // @note May raise when there are too many instance variables. rb_shape_t * rb_grow_iv_list(VALUE obj) |