merge revision(s) 0402193: [Backport #19709]

nagachika · nagachika · commit a3911b965f09 · 2023-07-22T13:08:16.000+09:00
Fix `Thread#join(timeout)` when running inside the fiber scheduler. (ruby#7903) --- test/fiber/test_thread.rb | 22 ++++++++++++++++++++++ thread.c | 5 +++++ 2 files changed, 27 insertions(+)
diff --git a/test/fiber/test_thread.rb b/test/fiber/test_thread.rb
@@ -20,6 +20,28 @@ def test_thread_join
     assert_equal :done, thread.value
   end
 
+  def test_thread_join_timeout
+    sleeper = nil
+
+    thread = Thread.new do
+      scheduler = Scheduler.new
+      Fiber.set_scheduler scheduler
+
+      Fiber.schedule do
+        sleeper = Thread.new{sleep}
+        sleeper.join(0.1)
+      end
+
+      scheduler.run
+    end
+
+    thread.join
+
+    assert_predicate sleeper, :alive?
+  ensure
+    sleeper&.kill
+  end
+
   def test_thread_join_implicit
     sleeping = false
     finished = false
diff --git a/thread.c b/thread.c
@@ -1048,6 +1048,10 @@ thread_join_sleep(VALUE arg)
 
         if (scheduler != Qnil) {
             rb_fiber_scheduler_block(scheduler, target_th->self, p->timeout);
+            // Check if the target thread is finished after blocking:
+            if (thread_finished(target_th)) break;
+            // Otherwise, a timeout occurred:
+            else return Qfalse;
         }
         else if (!limit) {
             th->status = THREAD_STOPPED_FOREVER;
@@ -1069,6 +1073,7 @@ thread_join_sleep(VALUE arg)
 
         RUBY_DEBUG_LOG("interrupted target_th:%u status:%s", rb_th_serial(target_th), thread_status_name(target_th, TRUE));
     }
+
     return Qtrue;
 }
 
diff --git a/version.h b/version.h
@@ -11,7 +11,7 @@
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 2
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 97
+#define RUBY_PATCHLEVEL 98
 
 #include "ruby/version.h"
 #include "ruby/internal/abi.h"

Original file line number	Diff line number	Diff line change
`@@ -1048,6 +1048,10 @@ thread_join_sleep(VALUE arg)`
`1048`	`1048`
`1049`	`1049`	`if (scheduler != Qnil) {`
`1050`	`1050`	`rb_fiber_scheduler_block(scheduler, target_th->self, p->timeout);`
	`1051`	`+ // Check if the target thread is finished after blocking:`
	`1052`	`+ if (thread_finished(target_th)) break;`
	`1053`	`+ // Otherwise, a timeout occurred:`
	`1054`	`+ else return Qfalse;`
`1051`	`1055`	`}`
`1052`	`1056`	`else if (!limit) {`
`1053`	`1057`	`th->status = THREAD_STOPPED_FOREVER;`
`@@ -1069,6 +1073,7 @@ thread_join_sleep(VALUE arg)`
`1069`	`1073`
`1070`	`1074`	`RUBY_DEBUG_LOG("interrupted target_th:%u status:%s", rb_th_serial(target_th), thread_status_name(target_th, TRUE));`
`1071`	`1075`	`}`
	`1076`	`+`
`1072`	`1077`	`return Qtrue;`
`1073`	`1078`	`}`
`1074`	`1079`