archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 16:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 04729fe68d: [Backport #20288]

Browse source 
Fix exception handling in `rb_fiber_scheduler_set`. (#10042)
This commit is contained in:
Takashi Kokubun 2024-05-28 17:46:47 -07:00
parent 0e96dd93c5
commit 9cb804a2bd
2 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
scheduler.c
View file

@ -161,6 +161,21 @@ verify_interface(VALUE scheduler)
} }
} }
static VALUE
fiber_scheduler_close(VALUE scheduler)
{
return rb_fiber_scheduler_close(scheduler);
}
static VALUE
fiber_scheduler_close_ensure(VALUE _thread)
{
rb_thread_t *thread = (rb_thread_t*)_thread;
thread->scheduler = Qnil;
return Qnil;
}
VALUE VALUE
rb_fiber_scheduler_set(VALUE scheduler) rb_fiber_scheduler_set(VALUE scheduler)
{ {
@ -178,7 +193,8 @@ rb_fiber_scheduler_set(VALUE scheduler)
// That way, we do not need to consider interactions, e.g., of a Fiber from // That way, we do not need to consider interactions, e.g., of a Fiber from
// the previous scheduler with the new scheduler. // the previous scheduler with the new scheduler.
if (thread->scheduler != Qnil) { if (thread->scheduler != Qnil) {
rb_fiber_scheduler_close(thread->scheduler); // rb_fiber_scheduler_close(thread->scheduler);
rb_ensure(fiber_scheduler_close, thread->scheduler, fiber_scheduler_close_ensure, (VALUE)thread);
} }
thread->scheduler = scheduler; thread->scheduler = scheduler;

2
version.h
View file

@ -11,7 +11,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 59 #define RUBY_PATCHLEVEL 60
#include "ruby/version.h" #include "ruby/version.h"
#include "ruby/internal/abi.h" #include "ruby/internal/abi.h"