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

thread_pthread.c (native_thread_destroy): clear native TSD pointer

Browse Source 
mwrap <https://80x24.org/mwrap/> interposes malloc functions and
checks for GVL existence to determine Ruby source locations of
malloc calls.  pthread_getattr_np (from get_stack) may call
realloc to get the CPU set size; so when using the thread-cache,
ruby_thread_has_gvl_p() may hit a false positive on reused
threads with lingering rb_thread_t in thread-specific data.

This was causing mwrap to call rb_source_location_cstr() and
crash because it was pointed to a zero ec->cfp->iseq.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63836 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
normal 2018-07-03 08:30:16 +00:00
parent 8fc203ba5f
commit 45cdc834c4
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
thread_pthread.c
View File

@ -427,15 +427,22 @@ native_thread_init(rb_thread_t *th)
ruby_thread_set_native(th); ruby_thread_set_native(th);
} }
#ifndef USE_THREAD_CACHE
#define USE_THREAD_CACHE 1
#endif
static void static void
native_thread_destroy(rb_thread_t *th) native_thread_destroy(rb_thread_t *th)
{ {
rb_native_cond_destroy(&th->native_thread_data.sleep_cond); rb_native_cond_destroy(&th->native_thread_data.sleep_cond);
}
#ifndef USE_THREAD_CACHE /*
#define USE_THREAD_CACHE 1 * prevent false positive from ruby_thread_has_gvl_p if that
#endif * gets called from an interposing function wrapper
*/
if (USE_THREAD_CACHE)
ruby_thread_set_native(0);
}
#if USE_THREAD_CACHE #if USE_THREAD_CACHE
static rb_thread_t *register_cached_thread_and_wait(void); static rb_thread_t *register_cached_thread_and_wait(void);