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

Use atomics for system_working global

Browse source 
Although it almost certainly works in this case, volatile is best not
used for multi-threaded code. Using atomics instead avoids warnings from
TSan.

This also simplifies some logic, as system_working was previously only
ever assigned to 1, so --system_working <= 0 should always return true
(unless it underflowed).
This commit is contained in:
John Hawthorn 2025-05-13 22:36:09 -07:00
parent d845da05e8
commit d67d169aea
Notes: git 2025-05-15 22:18:22 +00:00
4 changed files with 19 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

22
thread_pthread.c
View file

@ -2574,7 +2574,7 @@ rb_thread_wakeup_timer_thread(int sig)
timer_thread_wakeup_force();
// interrupt main thread if main thread is available
if (system_working) {
if (RUBY_ATOMIC_LOAD(system_working)) {
rb_vm_t *vm = GET_VM();
rb_thread_t *main_th = vm->ractor.main_thread;
@ -3005,12 +3005,12 @@ timer_thread_func(void *ptr)
RUBY_DEBUG_LOG("started%s", "");
while (system_working) {
while (RUBY_ATOMIC_LOAD(system_working)) {
timer_thread_check_signal(vm);
timer_thread_check_timeout(vm);
ubf_wakeup_all_threads();
RUBY_DEBUG_LOG("system_working:%d", system_working);
RUBY_DEBUG_LOG("system_working:%d", RUBY_ATOMIC_LOAD(system_working));
timer_thread_polling(vm);
}
@ -3124,18 +3124,16 @@ rb_thread_create_timer_thread(void)
static int
native_stop_timer_thread(void)
{
int stopped;
stopped = --system_working <= 0;
RUBY_ATOMIC_SET(system_working, 0);
if (stopped) {
RUBY_DEBUG_LOG("wakeup send %d", timer_th.comm_fds[1]);
timer_thread_wakeup_force();
RUBY_DEBUG_LOG("wakeup sent");
pthread_join(timer_th.pthread_id, NULL);
}
RUBY_DEBUG_LOG("wakeup send %d", timer_th.comm_fds[1]);
timer_thread_wakeup_force();
RUBY_DEBUG_LOG("wakeup sent");
pthread_join(timer_th.pthread_id, NULL);
if (TT_DEBUG) fprintf(stderr, "stop timer thread\n");
return stopped;
return 1;
}
static void