diff options
author | Yusuke Endoh <mame@ruby-lang.org> | 2021-07-28 11:05:36 +0900 |
---|---|---|
committer | Yusuke Endoh <mame@ruby-lang.org> | 2021-07-28 11:05:36 +0900 |
commit | 6505c77501f1924571b2fe620c5c7b31ede0cd22 (patch) | |
tree | 3dd62e955ab1a073aac6677df50f96d27c3b32b1 /vm.c | |
parent | 4fc9ddd7b6af54abf88d702c2e11e97ca7750ce3 (diff) |
Revert "Fix potential hang when joining threads."
This reverts commit 13f8521c630a15c87398dee0763e95f59c032a94.
http://rubyci.s3.amazonaws.com/solaris11-gcc/ruby-master/log/20210727T230009Z.fail.html.gz
http://rubyci.s3.amazonaws.com/solaris11-sunc/ruby-master/log/20210728T000009Z.fail.html.gz
This revert is to confirm whether the commit is the cause.
If the failures consistently occur after this revert, I'll
reintroduce the commit.
Diffstat (limited to 'vm.c')
-rw-r--r-- | vm.c | 17 |
1 files changed, 7 insertions, 10 deletions
@@ -3081,8 +3081,6 @@ th_init(rb_thread_t *th, VALUE self) th->thread_id_string[0] = '\0'; #endif - th->value = Qundef; - #if OPT_CALL_THREADED_CODE th->retval = Qundef; #endif @@ -3095,17 +3093,16 @@ static VALUE ruby_thread_init(VALUE self) { rb_thread_t *th = GET_THREAD(); - rb_thread_t *target_th = rb_thread_ptr(self); + rb_thread_t *targe_th = rb_thread_ptr(self); rb_vm_t *vm = th->vm; - target_th->vm = vm; - th_init(target_th, self); - - target_th->top_wrapper = 0; - target_th->top_self = rb_vm_top_self(); - target_th->ec->root_svar = Qfalse; - target_th->ractor = th->ractor; + targe_th->vm = vm; + th_init(targe_th, self); + targe_th->top_wrapper = 0; + targe_th->top_self = rb_vm_top_self(); + targe_th->ec->root_svar = Qfalse; + targe_th->ractor = th->ractor; return self; } |