diff options
| author | KJ Tsanaktsidis <[email protected]> | 2023-09-15 11:33:32 +1000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-09-15 10:33:32 +0900 |
| commit | 0117a6d389c5b607eaec1b7f917132efa356f665 (patch) | |
| tree | 573381ae40e12579515be9e571aef2590f89c76f /thread_pthread.c | |
| parent | f08cac066e3d327f2925607d7a33c8e9738aa4ee (diff) | |
Fix Thread#native_thread_id being cached across fork (#8418)
The native thread ID can and does change on some operating systems (e.g.
Linux) after forking, so it needs to be re-queried.
[Bug #19873]
Notes
Notes:
Merged-By: nurse <[email protected]>
Diffstat (limited to 'thread_pthread.c')
| -rw-r--r-- | thread_pthread.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/thread_pthread.c b/thread_pthread.c index 057c50c124..7c53325240 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -637,6 +637,18 @@ rb_thread_sched_destroy(struct rb_thread_sched *sched) clear_thread_cache_altstack(); } +#ifdef RB_THREAD_T_HAS_NATIVE_ID +static int +get_native_thread_id(void) +{ +#ifdef __linux__ + return (int)syscall(SYS_gettid); +#elif defined(__FreeBSD__) + return pthread_getthreadid_np(); +#endif +} +#endif + #if defined(HAVE_WORKING_FORK) static void thread_cache_reset(void); static void @@ -646,6 +658,9 @@ thread_sched_atfork(struct rb_thread_sched *sched) thread_cache_reset(); rb_thread_sched_init(sched); thread_sched_to_running(sched, GET_THREAD()); +#ifdef RB_THREAD_T_HAS_NATIVE_ID + GET_THREAD()->nt->tid = get_native_thread_id(); +#endif } #endif @@ -693,18 +708,6 @@ ruby_thread_set_native(rb_thread_t *th) #endif } -#ifdef RB_THREAD_T_HAS_NATIVE_ID -static int -get_native_thread_id(void) -{ -#ifdef __linux__ - return (int)syscall(SYS_gettid); -#elif defined(__FreeBSD__) - return pthread_getthreadid_np(); -#endif -} -#endif - static void native_thread_init(struct rb_native_thread *nt) { |