From 1398573684c84f6902cb874e176abe9ffd4a6a4d Mon Sep 17 00:00:00 2001 From: ko1 Date: Wed, 13 Aug 2008 07:53:35 +0000 Subject: * thread.c, vm_core.h: add manual priority support using time slice. if you enable USE_NATIVE_THREAD_PRIORITY macro, this mechanism is ignored. [ruby-dev:33124] * thread_pthread.c, thread_win32.c: ditto. * test/ruby/test_thread.rb: fix test parameter. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18570 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- thread.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) (limited to 'thread.c') diff --git a/thread.c b/thread.c index ffa3fce47..20cb6b931 100644 --- a/thread.c +++ b/thread.c @@ -48,6 +48,12 @@ #include "vm.h" #include "gc.h" +#ifndef USE_NATIVE_THREAD_PRIORITY +#define USE_NATIVE_THREAD_PRIORITY 0 +#define RUBY_THREAD_PRIORITY_MAX 3 +#define RUBY_THREAD_PRIORITY_MIN -3 +#endif + #ifndef THREAD_DEBUG #define THREAD_DEBUG 0 #endif @@ -996,8 +1002,26 @@ 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++; + goto reschedule; + } + else { + th->slice = th->priority; + } + } +#endif } } } @@ -1847,12 +1871,25 @@ rb_thread_priority_set(VALUE thread, VALUE prio) { rb_thread_t *th; GetThreadPtr(thread, th); + int priority; rb_secure(4); +#if USE_NATIVE_THREAD_PRIORITY th->priority = NUM2INT(prio); native_thread_apply_priority(th); - return prio; +#else + priority = NUM2INT(prio); + if (priority > RUBY_THREAD_PRIORITY_MAX) { + priority = RUBY_THREAD_PRIORITY_MAX; + } + else if (priority < RUBY_THREAD_PRIORITY_MIN) { + priority = RUBY_THREAD_PRIORITY_MIN; + } + th->priority = priority; + th->slice = priority; +#endif + return INT2NUM(th->priority); } /* for IO */ -- cgit