mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* vm_core.h, thread.c, cont.c: add RUBY_VM_SET_INTERRUPT(),
RUBY_VM_SET_TIMER_INTERRUPT(), RUBY_VM_INTERRUPTED(). * thread.c, thread_pthread.c, thread_win32.c: fix to ignore time slice event until sleep. * bootstraptest/test_thread.rb: add a test for time limited join test. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14654 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
94c942ed34
commit
5f0b8afb97
7 changed files with 50 additions and 15 deletions
|
@ -208,17 +208,26 @@ native_sleep(rb_thread_t *th, struct timeval *tv)
|
|||
{
|
||||
DWORD ret;
|
||||
int status = th->status;
|
||||
|
||||
th->status = THREAD_STOPPED;
|
||||
th->unblock_function = ubf_handle;
|
||||
th->unblock_function_arg = th;
|
||||
thread_debug("native_sleep start (%d)\n", (int)msec);
|
||||
ret = w32_wait_events(0, 0, msec, th);
|
||||
thread_debug("native_sleep done (%d)\n", ret);
|
||||
|
||||
if (RUBY_VM_INTERRUPTED(th)) {
|
||||
/* interrupted. return immediate */
|
||||
}
|
||||
else {
|
||||
thread_debug("native_sleep start (%d)\n", (int)msec);
|
||||
ret = w32_wait_events(0, 0, msec, th);
|
||||
thread_debug("native_sleep done (%d)\n", ret);
|
||||
}
|
||||
|
||||
th->unblock_function = 0;
|
||||
th->unblock_function_arg = 0;
|
||||
th->status = status;
|
||||
}
|
||||
GVL_UNLOCK_END();
|
||||
RUBY_VM_CHECK_INTS();
|
||||
}
|
||||
|
||||
int
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue