ruby-changes:64515
From: Koichi <ko1@a...>
Date: Wed, 23 Dec 2020 16:56:15 +0900 (JST)
Subject: [ruby-changes:64515] e052d07163 (master): Revert "need to clear blocking cnt at fork (child process)"
https://git.ruby-lang.org/ruby.git/commit/?id=e052d07163 From e052d0716325bcb499c57b1de0c6e3eb9effb299 Mon Sep 17 00:00:00 2001 From: Koichi Sasada <ko1@a...> Date: Wed, 23 Dec 2020 16:55:36 +0900 Subject: Revert "need to clear blocking cnt at fork (child process)" This reverts commit 0dd4896175f95c4c2a26d91a97b9fcb9a74cc0c6. It breaks the tests on RUBY_DEBUG=1. diff --git a/thread.c b/thread.c index 354ddd8..a7cd6e4 100644 --- a/thread.c +++ b/thread.c @@ -4743,10 +4743,9 @@ rb_thread_atfork_internal(rb_thread_t *th, void (*atfork)(rb_thread_t *, const r https://github.com/ruby/ruby/blob/trunk/thread.c#L4743 // threads vm->ractor.cnt = 0; - vm->ractor.blocking_cnt = 0; rb_ractor_living_threads_init(th->ractor); rb_ractor_living_threads_insert(th->ractor, th); - rb_vm_ractor_blocking_cnt_dec(th->vm, th->ractor, __FILE__, __LINE__); + /* may be held by MJIT threads in parent */ rb_native_mutex_initialize(&vm->waitpid_lock); -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/