kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

revert r35486 (add rb_thread_t#yeiling field). because it doesn't help

Browse source 
to close a race.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38062 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
kosaki 2012-11-30 13:52:24 +00:00
parent 5d33dad16c
commit 2e72d1c323
3 changed files with 1 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ChangeLog
View file

@ -10257,22 +10257,6 @@ Sun Apr 29 06:12:02 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm.c (m_core_hash_merge_kwd): merge keyword hash into intermediate
hash. leftward argument is prior currently.
Sat Apr 28 18:39:40 2012 Koichi Sasada <ko1@atdot.net>
* vm_core.h (rb_thread_t#yielding): add a field.
* thread.c (rb_thread_schedule_limits): set th#yielding while
release GVL to yield CPU time.
* thread.c (timer_thread_function): skip timer interrupt when
th#yielding is true. This patch fixes r35480.
* thread.c (rb_threadptr_execute_interrupts_common): revert
a patch of r35480.
* ChangeLog: add an extended memo of r35480.
http://bugs.ruby-lang.org/projects/ruby-trunk/wiki/R35480_ExtendedMemo
Fri Apr 27 12:34:23 2012 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/dl/cfunc.c (rb_dlcfunc_call): should convert a Bignum value to

6
thread.c
View file

@ -1047,10 +1047,8 @@ rb_thread_schedule_limits(unsigned long limits_us)
if (th->running_time_us >= limits_us) {
thread_debug("rb_thread_schedule/switch start\n");
th->yielding = 1;
RB_GC_SAVE_MACHINE_CONTEXT(th);
gvl_yield(th->vm, th);
th->yielding = 0;
rb_thread_set_current(th);
thread_debug("rb_thread_schedule/switch done\n");
}
@ -3635,9 +3633,7 @@ timer_thread_function(void *arg)
rb_vm_t *vm = GET_VM(); /* TODO: fix me for Multi-VM */
/* for time slice */
if (!vm->running_thread->yielding) {
RUBY_VM_SET_TIMER_INTERRUPT(vm->running_thread);
}
RUBY_VM_SET_TIMER_INTERRUPT(vm->running_thread);
/* check signal */
rb_threadptr_check_signal(vm->main_thread);

1
vm_core.h
View file

@ -478,7 +478,6 @@ typedef struct rb_thread_struct {
/* passing state */
int state;
int yielding;
int waiting_fd;