1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TestThreadInstrumentation: emit the EXIT event sooner

Browse Source 
```
  1) Failure:
TestThreadInstrumentation#test_thread_instrumentation [/tmp/ruby/src/trunk-repeat20-asserts/test/-ext-/thread/test_instrumentation_api.rb:33]:
Call counters[4]: [3, 4, 4, 4, 0].
Expected 0 to be > 0.
```

We fire the EXIT hook after the call to `thread_sched_to_dead` which
mean another thread might be running before the `EXIT` hook have been
executed.
This commit is contained in:
Jean Boussier 2023-02-06 09:29:39 +01:00 committed by Jean Boussier
parent 22d944c8b7
commit 704dd25812
Notes: git 2023-03-06 12:11:02 +00:00 
Merged: https://github.com/ruby/ruby/pull/7249
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
thread.c
View File

@ -635,7 +635,6 @@ thread_do_start(rb_thread_t *th)
}
void rb_ec_clear_current_thread_trace_func(const rb_execution_context_t *ec);
#define thread_sched_to_dead thread_sched_to_waiting
static int
thread_start_func_2(rb_thread_t *th, VALUE *stack_start)

2
thread_none.c
View File

@ -34,6 +34,8 @@ thread_sched_to_waiting(struct rb_thread_sched *sched)
{
}
#define thread_sched_to_dead thread_sched_to_waiting
static void
thread_sched_yield(struct rb_thread_sched *sched, rb_thread_t *th)
{

9
thread_pthread.c
View File

@ -449,6 +449,13 @@ thread_sched_to_waiting(struct rb_thread_sched *sched)
rb_native_mutex_unlock(&sched->lock);
}
static void
thread_sched_to_dead(struct rb_thread_sched *sched)
{
RB_INTERNAL_THREAD_HOOK(RUBY_INTERNAL_THREAD_EVENT_EXITED);
thread_sched_to_waiting(sched);
}
static void
thread_sched_yield(struct rb_thread_sched *sched, rb_thread_t *th)
{
@ -1171,8 +1178,6 @@ thread_start_func_1(void *th_ptr)
#else
thread_start_func_2(th, &stack_start);
#endif
RB_INTERNAL_THREAD_HOOK(RUBY_INTERNAL_THREAD_EVENT_EXITED);
}
#if USE_THREAD_CACHE
/* cache thread */

2
thread_win32.c
View File

@ -131,6 +131,8 @@ thread_sched_to_running(struct rb_thread_sched *sched, rb_thread_t *th)
if (GVL_DEBUG) fprintf(stderr, "gvl acquire (%p): acquire\n", th);
}
#define thread_sched_to_dead thread_sched_to_waiting
static void
thread_sched_to_waiting(struct rb_thread_sched *sched)
{