summaryrefslogtreecommitdiff
path: root/thread.c
diff options
context:
space:
mode:
authorNARUSE, Yui <naruse@airemix.jp>2021-03-13 05:12:54 +0900
committerNARUSE, Yui <naruse@airemix.jp>2021-03-13 05:12:54 +0900
commit6f9e007729d53fdbc22e37e52129ea5aa2556d0e (patch)
tree416fb1d9cd961cd9822e494e7709df557ee7d360 /thread.c
parent6bf32cbed8f3fd0b73b99737d671f833c594d800 (diff)
merge revision(s) b3c53a8a885be8f5cc2b712798b0d2741c488ce4: [Backport #17672]
Make Ractor stdio belonging to the Ractor [Bug #17672] Defer making ractor stdio until ractor started. Before ractor started, created objects belong to the caller ractor instead of the created ractor. --- bootstraptest/test_ractor.rb | 12 ++++++++++++ ractor.c | 9 --------- thread.c | 9 +++++++++ 3 files changed, 21 insertions(+), 9 deletions(-)
Diffstat (limited to 'thread.c')
-rw-r--r--thread.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/thread.c b/thread.c
index 1605644f83..2ee878939b 100644
--- a/thread.c
+++ b/thread.c
@@ -770,6 +770,11 @@ thread_do_start(rb_thread_t *th)
void rb_ec_clear_current_thread_trace_func(const rb_execution_context_t *ec);
+// io.c
+VALUE rb_io_prep_stdin(void);
+VALUE rb_io_prep_stdout(void);
+VALUE rb_io_prep_stderr(void);
+
static int
thread_start_func_2(rb_thread_t *th, VALUE *stack_start)
{
@@ -792,6 +797,10 @@ thread_start_func_2(rb_thread_t *th, VALUE *stack_start)
RB_VM_LOCK();
{
rb_vm_ractor_blocking_cnt_dec(th->vm, th->ractor, __FILE__, __LINE__);
+ rb_ractor_t *r = th->ractor;
+ r->r_stdin = rb_io_prep_stdin();
+ r->r_stdout = rb_io_prep_stdout();
+ r->r_stderr = rb_io_prep_stderr();
}
RB_VM_UNLOCK();
}