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

rb_io_blocking_operation_exit should not execute with pending interrupts.

Browse source
This commit is contained in:
Samuel Williams 2025-05-24 20:33:08 +09:00
parent e093c3145a
commit 81a23c5793
Notes: git 2025-06-06 04:13:29 +00:00
5 changed files with 170 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

15
thread.c
View file

@ -207,6 +207,10 @@ static inline void blocking_region_end(rb_thread_t *th, struct rb_blocking_regio
static inline int
vm_check_ints_blocking(rb_execution_context_t *ec)
{
#ifdef RUBY_ASSERT_CRITICAL_SECTION
VM_ASSERT(ruby_assert_critical_section_entered == 0);
#endif
rb_thread_t *th = rb_ec_thread_ptr(ec);
if (LIKELY(rb_threadptr_pending_interrupt_empty_p(th))) {
@ -1947,6 +1951,9 @@ rb_thread_io_blocking_call(struct rb_io* io, rb_blocking_function_t *func, void
RUBY_VM_CHECK_INTS_BLOCKING(ec);
goto retry;
}
RUBY_VM_CHECK_INTS_BLOCKING(ec);
state = saved_state;
}
EC_POP_TAG();
@ -1961,9 +1968,6 @@ rb_thread_io_blocking_call(struct rb_io* io, rb_blocking_function_t *func, void
EC_JUMP_TAG(ec, state);
}
/* TODO: check func() */
RUBY_VM_CHECK_INTS_BLOCKING(ec);
// If the error was a timeout, we raise a specific exception for that:
if (saved_errno == ETIMEDOUT) {
rb_raise(rb_eIOTimeoutError, "Blocking operation timed out!");
@ -4471,6 +4475,8 @@ do_select(VALUE p)
RUBY_VM_CHECK_INTS_BLOCKING(set->th->ec); /* may raise */
} while (wait_retryable(&result, lerrno, to, endtime) && do_select_update());
RUBY_VM_CHECK_INTS_BLOCKING(set->th->ec);
if (result < 0) {
errno = lerrno;
}
@ -4591,7 +4597,10 @@ thread_io_wait(struct rb_io *io, int fd, int events, struct timeval *timeout)
RUBY_VM_CHECK_INTS_BLOCKING(ec);
} while (wait_retryable(&result, lerrno, to, end));
RUBY_VM_CHECK_INTS_BLOCKING(ec);
}
EC_POP_TAG();
}