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

Fix compatibility with fiber schedulers that don't implement #fiber_interrupt. (#13492)

Browse source
This commit is contained in:
Samuel Williams 2025-06-02 05:50:23 -04:00 • committed by GitHub
parent 20d7db8cba
commit 9a29252830
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
Notes: git 2025-06-02 09:50:37 +00:00 
Merged-By: ioquatix <samuel@codeotaku.com>
2 changed files with 55 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

34
scheduler.c
View file

@ -170,6 +170,10 @@ verify_interface(VALUE scheduler)
if (!rb_respond_to(scheduler, id_io_wait)) {
rb_raise(rb_eArgError, "Scheduler must implement #io_wait");
}
if (!rb_respond_to(scheduler, id_fiber_interrupt)) {
rb_warn("Scheduler should implement #fiber_interrupt");
}
}
static VALUE
@ -458,7 +462,11 @@ rb_fiber_scheduler_io_wait(VALUE scheduler, VALUE io, VALUE events, VALUE timeou
scheduler, io, events, timeout
};
return rb_thread_io_blocking_operation(io, fiber_scheduler_io_wait, (VALUE)&arguments);
if (rb_respond_to(scheduler, id_fiber_interrupt)) {
return rb_thread_io_blocking_operation(io, fiber_scheduler_io_wait, (VALUE)&arguments);
} else {
return fiber_scheduler_io_wait((VALUE)&arguments);
}
}
VALUE
@ -546,7 +554,11 @@ rb_fiber_scheduler_io_read(VALUE scheduler, VALUE io, VALUE buffer, size_t lengt
scheduler, io, buffer, SIZET2NUM(length), SIZET2NUM(offset)
};
return rb_thread_io_blocking_operation(io, fiber_scheduler_io_read, (VALUE)&arguments);
if (rb_respond_to(scheduler, id_fiber_interrupt)) {
return rb_thread_io_blocking_operation(io, fiber_scheduler_io_read, (VALUE)&arguments);
} else {
return fiber_scheduler_io_read((VALUE)&arguments);
}
}
/*
@ -581,7 +593,11 @@ rb_fiber_scheduler_io_pread(VALUE scheduler, VALUE io, rb_off_t from, VALUE buff
scheduler, io, buffer, OFFT2NUM(from), SIZET2NUM(length), SIZET2NUM(offset)
};
return rb_thread_io_blocking_operation(io, fiber_scheduler_io_pread, (VALUE)&arguments);
if (rb_respond_to(scheduler, id_fiber_interrupt)) {
return rb_thread_io_blocking_operation(io, fiber_scheduler_io_pread, (VALUE)&arguments);
} else {
return fiber_scheduler_io_pread((VALUE)&arguments);
}
}
/*
@ -630,7 +646,11 @@ rb_fiber_scheduler_io_write(VALUE scheduler, VALUE io, VALUE buffer, size_t leng
scheduler, io, buffer, SIZET2NUM(length), SIZET2NUM(offset)
};
return rb_thread_io_blocking_operation(io, fiber_scheduler_io_write, (VALUE)&arguments);
if (rb_respond_to(scheduler, id_fiber_interrupt)) {
return rb_thread_io_blocking_operation(io, fiber_scheduler_io_write, (VALUE)&arguments);
} else {
return fiber_scheduler_io_write((VALUE)&arguments);
}
}
/*
@ -666,7 +686,11 @@ rb_fiber_scheduler_io_pwrite(VALUE scheduler, VALUE io, rb_off_t from, VALUE buf
scheduler, io, buffer, OFFT2NUM(from), SIZET2NUM(length), SIZET2NUM(offset)
};
return rb_thread_io_blocking_operation(io, fiber_scheduler_io_pwrite, (VALUE)&arguments);
if (rb_respond_to(scheduler, id_fiber_interrupt)) {
return rb_thread_io_blocking_operation(io, fiber_scheduler_io_pwrite, (VALUE)&arguments);
} else {
return fiber_scheduler_io_pwrite((VALUE)&arguments);
}
}
VALUE