archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Use RB_VM_LOCKING

Browse source
This commit is contained in:
Nobuyoshi Nakada 2025-05-23 20:14:20 +09:00
parent fc518fe1ff
commit aad9fa2853
No known key found for this signature in database
GPG key ID: 3582D74E1FEE4465
Notes: git 2025-05-26 02:44:06 +00:00
18 changed files with 206 additions and 328 deletions
Download patch file Download diff file Expand all files Collapse all files

19
string.c
View file

@ -682,10 +682,8 @@ fstring_insert_on_resize(struct fstring_table_struct *table, VALUE hash_code, VA
// Rebuilds the table
static void
fstring_try_resize(VALUE old_table_obj)
fstring_try_resize_without_locking(VALUE old_table_obj)
{
RB_VM_LOCK_ENTER();
// Check if another thread has already resized
if (RUBY_ATOMIC_VALUE_LOAD(fstring_table_obj) != old_table_obj) {
goto end;
@ -737,7 +735,14 @@ fstring_try_resize(VALUE old_table_obj)
end:
RB_GC_GUARD(old_table_obj);
RB_VM_LOCK_LEAVE();
}
static void
fstring_try_resize(VALUE old_table_obj)
{
RB_VM_LOCKING() {
fstring_try_resize_without_locking(old_table_obj);
}
}
static VALUE
@ -749,7 +754,7 @@ fstring_find_or_insert(VALUE hash_code, VALUE value, struct fstr_update_arg *arg
VALUE table_obj;
struct fstring_table_struct *table;
retry:
retry:
table_obj = RUBY_ATOMIC_VALUE_LOAD(fstring_table_obj);
RUBY_ASSERT(table_obj);
table = RTYPEDDATA_GET_DATA(table_obj);
@ -798,8 +803,7 @@ fstring_find_or_insert(VALUE hash_code, VALUE value, struct fstr_update_arg *arg
}
else if (candidate == FSTRING_TABLE_MOVED) {
// Wait
RB_VM_LOCK_ENTER();
RB_VM_LOCK_LEAVE();
RB_VM_LOCKING();
goto retry;
}
@ -13271,3 +13275,4 @@ Init_String(void)
rb_define_method(rb_cSymbol, "encoding", sym_encoding, 0);
}