Permalink
Browse files

* thread.c (rb_thread_schedule_rec): call gvl_yield() unconditionally.

* thread_pthread.c: remove HAVE_GVL_YIELD macro.
* thread_win32.c (gvl_yield): new. this fallback logic was moved from
  rb_thread_schedule_rec().



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32069 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent 57ed1e9 commit afd1a64cd6ee73e69744a09242cc079b3f1f5170 @kosaki kosaki committed Jun 13, 2011
Showing with 18 additions and 13 deletions.
  1. +7 −0 ChangeLog
  2. +2 −12 thread.c
  3. +0 −1 thread_pthread.c
  4. +9 −0 thread_win32.c
View
@@ -1,3 +1,10 @@
+Mon Jun 13 23:55:40 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * thread.c (rb_thread_schedule_rec): call gvl_yield() unconditionally.
+ * thread_pthread.c: remove HAVE_GVL_YIELD macro.
+ * thread_win32.c (gvl_yield): new. this fallback logic was moved from
+ rb_thread_schedule_rec().
+
Mon Jun 13 23:50:25 2011 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/io/console/console.c (console_dev): typo.
View
@@ -1025,18 +1025,8 @@ rb_thread_schedule_rec(int sched_depth, unsigned long limits_us)
RB_GC_SAVE_MACHINE_CONTEXT(th);
-#if HAVE_GVL_YIELD
- {
- if (th->running_time_us >= limits_us)
- gvl_yield(th->vm, th);
- }
-#else
- gvl_release(th->vm);
- {
- native_thread_yield();
- }
- gvl_acquire(th->vm, th);
-#endif
+ if (th->running_time_us >= limits_us)
+ gvl_yield(th->vm, th);
rb_thread_set_current(th);
thread_debug("rb_thread_schedule/switch done\n");
View
@@ -83,7 +83,6 @@ gvl_release(rb_vm_t *vm)
native_mutex_unlock(&vm->gvl.lock);
}
-#define HAVE_GVL_YIELD 1
static void
gvl_yield(rb_vm_t *vm, rb_thread_t *th)
{
View
@@ -106,6 +106,15 @@ gvl_release(rb_vm_t *vm)
}
static void
+gvl_yield(rb_vm_t *vm, rb_thread_t *th)
+{
+ gvl_release(th->vm);
+ native_thread_yield();
+ gvl_acquire(vm, th);
+}
+
+
+static void
gvl_atfork(rb_vm_t *vm)
{
rb_bug("gvl_atfork() is called on win32");

0 comments on commit afd1a64

Please sign in to comment.