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

Fix blocking operation cancellation. (#13614)

Browse source 
Expose `rb_thread_resolve_unblock_function` internally.
This commit is contained in:
Samuel Williams 2025-06-14 12:32:51 +09:00 • committed by GitHub
parent c45c600e22
commit 68625a23d6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
Notes: git 2025-06-14 03:33:04 +00:00 
Merged-By: ioquatix <samuel@codeotaku.com>
3 changed files with 49 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

31
thread.c
View file

@ -1540,6 +1540,29 @@ blocking_region_end(rb_thread_t *th, struct rb_blocking_region_buffer *region)
#endif
}
/*
* Resolve sentinel unblock function values to their actual function pointers
* and appropriate data2 values. This centralizes the logic for handling
* RUBY_UBF_IO and RUBY_UBF_PROCESS sentinel values.
*
* @param unblock_function Pointer to unblock function pointer (modified in place)
* @param data2 Pointer to data2 pointer (modified in place)
* @param thread Thread context for resolving data2 when needed
* @return true if sentinel values were resolved, false otherwise
*/
bool
rb_thread_resolve_unblock_function(rb_unblock_function_t **unblock_function, void **data2, struct rb_thread_struct *thread)
{
rb_unblock_function_t *ubf = *unblock_function;
if ((ubf == RUBY_UBF_IO) || (ubf == RUBY_UBF_PROCESS)) {
*unblock_function = ubf_select;
*data2 = thread;
return true;
}
return false;
}
void *
rb_nogvl(void *(*func)(void *), void *data1,
rb_unblock_function_t *ubf, void *data2,
@ -1566,11 +1589,9 @@ rb_nogvl(void *(*func)(void *), void *data1,
bool is_main_thread = vm->ractor.main_thread == th;
int saved_errno = 0;
if ((ubf == RUBY_UBF_IO) || (ubf == RUBY_UBF_PROCESS)) {
ubf = ubf_select;
data2 = th;
}
else if (ubf && rb_ractor_living_thread_num(th->ractor) == 1 && is_main_thread) {
rb_thread_resolve_unblock_function(&ubf, &data2, th);
if (ubf && rb_ractor_living_thread_num(th->ractor) == 1 && is_main_thread) {
if (flags & RB_NOGVL_UBF_ASYNC_SAFE) {
vm->ubf_async_safe = 1;
}