1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix exception handling in rb_fiber_scheduler_set. (#10042)

Browse Source
This commit is contained in:
Samuel Williams 2024-02-22 00:33:18 +13:00 committed by GitHub
parent 78d9fe6947
commit 04729fe68d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 1 deletions
Show Stats 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;