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

* thread_win32.c (native_sleep): must block reentrance when accessing

Browse Source 
th->unblock.
	  fixed [ruby-core:17341], reported by Bill Kelly <billk at cts.com>



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2008-06-21 07:48:29 +00:00
parent d2c3d9dd0b
commit 8724448ed5
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Sat Jun 21 16:46:09 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* thread_win32.c (native_sleep): must block reentrance when accessing
th->unblock.
fixed [ruby-core:17341], reported by Bill Kelly <billk at cts.com>
Sat Jun 21 16:29:02 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Jun 21 16:29:02 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (call_args2, open_args): removed. * parse.y (call_args2, open_args): removed.

4
thread_win32.c
View File

@ -229,8 +229,10 @@ native_sleep(rb_thread_t *th, struct timeval *tv, int deadlockable)
{ {
DWORD ret; DWORD ret;
native_mutex_lock(&th->interrupt_lock);
th->unblock.func = ubf_handle; th->unblock.func = ubf_handle;
th->unblock.arg = th; th->unblock.arg = th;
native_mutex_unlock(&th->interrupt_lock);
if (RUBY_VM_INTERRUPTED(th)) { if (RUBY_VM_INTERRUPTED(th)) {
/* interrupted. return immediate */ /* interrupted. return immediate */
@ -241,8 +243,10 @@ native_sleep(rb_thread_t *th, struct timeval *tv, int deadlockable)
thread_debug("native_sleep done (%lu)\n", ret); thread_debug("native_sleep done (%lu)\n", ret);
} }
native_mutex_lock(&th->interrupt_lock);
th->unblock.func = 0; th->unblock.func = 0;
th->unblock.arg = 0; th->unblock.arg = 0;
native_mutex_unlock(&th->interrupt_lock);
} }
GVL_UNLOCK_END(); GVL_UNLOCK_END();
th->status = prev_status; th->status = prev_status;