summaryrefslogtreecommitdiffstats
path: root/thread.c
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-13 21:26:49 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-13 21:26:49 +0000
commit34856193be71c7f7605838a7cd22ec8d6aee5ae5 (patch)
treee6daf37b950e1a7e7f5dcf04c59b5ca028955004 /thread.c
parent985c4da5535edce1a540bef2be83ae0ce35524db (diff)
downloadruby-34856193be71c7f7605838a7cd22ec8d6aee5ae5.tar.gz
ruby-34856193be71c7f7605838a7cd22ec8d6aee5ae5.tar.xz
ruby-34856193be71c7f7605838a7cd22ec8d6aee5ae5.zip
* thread.c (rb_thread_execute_interrupts): switch event
should be occur only once. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18596 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread.c')
-rw-r--r--thread.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/thread.c b/thread.c
index e30e4e33d..5032f773e 100644
--- a/thread.c
+++ b/thread.c
@@ -1015,16 +1015,13 @@ rb_thread_execute_interrupts(rb_thread_t *th)
}
if (timer_interrupt) {
-#if USE_NATIVE_THREAD_PRIORITY
EXEC_EVENT_HOOK(th, RUBY_EVENT_SWITCH, th->cfp->self, 0, 0);
- rb_thread_schedule();
-#else
+
if (th->slice > 0) {
th->slice--;
}
else {
reschedule:
- EXEC_EVENT_HOOK(th, RUBY_EVENT_SWITCH, th->cfp->self, 0, 0);
rb_thread_schedule();
if (th->slice < 0) {
th->slice++;
@@ -1034,7 +1031,6 @@ rb_thread_execute_interrupts(rb_thread_t *th)
th->slice = th->priority;
}
}
-#endif
}
}
}