diff options
| author | nagachika <nagachika@ruby-lang.org> | 2025-11-03 10:10:57 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2025-11-03 10:10:57 +0900 |
| commit | 2da2d33cc49efd5508757aadc7e97db2968dfdfa (patch) | |
| tree | 68cfb63c187e6cd63d3dd8f4244f86700615e8d1 | |
| parent | 609f957ebede1a062b1f34515382e4c306f77444 (diff) | |
merge revision(s) e500222de1a8d5e7a844209a7e912b03db8cdf76:
[PATCH] fix last commit
`th` is gone.
| -rw-r--r-- | thread_pthread.c | 4 | ||||
| -rw-r--r-- | version.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/thread_pthread.c b/thread_pthread.c index 1d26ce3d10..ed624416aa 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -1295,7 +1295,7 @@ rb_ractor_sched_sleep(rb_execution_context_t *ec, rb_ractor_t *cr, rb_unblock_fu { // ractor lock of cr is acquired // r is sleeping statuss - rb_thread_t *th = rb_ec_thread_ptr(ec); + rb_thread_t * volatile th = rb_ec_thread_ptr(ec); struct rb_thread_sched *sched = TH_SCHED(th); cr->sync.wait.waiting_thread = th; // TODO: multi-thread @@ -2927,7 +2927,7 @@ timer_thread_deq_wakeup(rb_vm_t *vm, rb_hrtime_t now) (w->flags & thread_sched_waiting_timeout) && timer_thread_check_exceed(w->data.timeout, now)) { - RUBY_DEBUG_LOG("wakeup th:%u", rb_th_serial(th)); + RUBY_DEBUG_LOG("wakeup th:%u", rb_th_serial(thread_sched_waiting_thread(w))); // delete from waiting list ccan_list_del_init(&w->node); @@ -11,7 +11,7 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 10 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 186 +#define RUBY_PATCHLEVEL 187 #include "ruby/version.h" #include "ruby/internal/abi.h" |