diff options
| author | Samuel Williams <[email protected]> | 2025-05-24 20:33:08 +0900 |
|---|---|---|
| committer | Samuel Williams <[email protected]> | 2025-06-06 13:13:16 +0900 |
| commit | 81a23c5793fecaff5f75cefe6a6e03dab99df16b (patch) | |
| tree | a34dfc6ea30ed7cc57ab3b69ea2983abb1951e43 /thread.c | |
| parent | e093c3145ac7a2efcbc7965e43f29a992316ab64 (diff) | |
`rb_io_blocking_operation_exit` should not execute with pending interrupts.
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/13437
Diffstat (limited to 'thread.c')
| -rw-r--r-- | thread.c | 15 |
1 files changed, 12 insertions, 3 deletions
@@ -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(); } |