From 769ff25033ff891e1487dfc7b714f0daa6ebdf65 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 18 Aug 2007 08:40:13 +0000 Subject: * thread.c (is_ruby_native_thread): check properly. [ruby-dev:31166] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13104 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ thread.c | 5 ++++- thread_pthread.ci | 22 ++++++++++++++++++++-- thread_win32.ci | 18 +++++++++++++++++- 4 files changed, 45 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 448b8ad81..00a88d29a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sat Aug 18 17:40:11 2007 Nobuyoshi Nakada + + * thread.c (is_ruby_native_thread): check properly. [ruby-dev:31166] + Sat Aug 18 16:44:15 2007 Koichi Sasada * insnhelper.ci (vm_call_bmethod), diff --git a/thread.c b/thread.c index 69f3b29e9..aec4340d5 100644 --- a/thread.c +++ b/thread.c @@ -3002,5 +3002,8 @@ Init_Thread(void) int is_ruby_native_thread(void) { - return Qtrue; + rb_thread_t *rb_thread_check_ptr(rb_thread_t *ptr); + rb_thread_t *th = ruby_thread_from_native(); + + return th ? Qtrue : Qfalse; } diff --git a/thread_pthread.ci b/thread_pthread.ci index d624e9848..b8b609145 100644 --- a/thread_pthread.ci +++ b/thread_pthread.ci @@ -72,16 +72,34 @@ static void remove_signal_thread_list(rb_thread_t *th); static rb_thread_lock_t signal_thread_list_lock; +static pthread_key_t ruby_native_thread_key; + static void null_func() { /* null */ } +static rb_thread_t * +ruby_thread_from_native(void) +{ + return pthread_getspecific(ruby_native_thread_key); +} + +static int +ruby_thread_set_native(rb_thread_t *th) +{ + return pthread_setspecific(ruby_native_thread_key, th) == 0; +} + static void -Init_native_thread() +Init_native_thread(void) { - GET_THREAD()->thread_id = pthread_self(); + rb_thread_t *th = GET_THREAD(); + + pthread_key_create(&ruby_native_thread_key, NULL); + th->thread_id = pthread_self(); + ruby_thread_set_native(th); native_mutex_initialize(&signal_thread_list_lock); posix_signal(SIGVTALRM, null_func); } diff --git a/thread_win32.ci b/thread_win32.ci index bfb7f681c..3bdb2e427 100644 --- a/thread_win32.ci +++ b/thread_win32.ci @@ -20,10 +20,26 @@ #define native_thread_yield() Sleep(0) #define remove_signal_thread_list(th) +static volatile DWORD ruby_native_thread_key = TLS_OUT_OF_INDEXES; + +static rb_thread_t * +ruby_thread_from_native(void) +{ + return TlsGetValue(ruby_native_thread_key); +} + +static int +ruby_thread_set_native(rb_thread_t *th) +{ + return TlsSetValue(ruby_native_thread_key, th); +} + static void -Init_native_thread() +Init_native_thread(void) { rb_thread_t *th = GET_THREAD(); + + ruby_native_thread_key = TlsAlloc(); DuplicateHandle(GetCurrentProcess(), GetCurrentThread(), GetCurrentProcess(), -- cgit