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

* cont.c (cont_mark, cont_capture, cont_restore_1): speed up

Browse source 
continuation by copying only valid YARV stack.  [ruby-dev:37106]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20256 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mame 2008-11-18 16:19:37 +00:00
parent 552d666266
commit 5ecc2ee022
2 changed files with 31 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Nov 19 01:05:26 2008 Yusuke Endoh <mame@tsg.ne.jp>
* cont.c (cont_mark, cont_capture, cont_restore_1): speed up
continuation by copying only valid YARV stack. [ruby-dev:37106]
Wed Nov 19 00:03:13 2008 Yukihiro Matsumoto <matz@ruby-lang.org> Wed Nov 19 00:03:13 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/time.rb: according to RFC2822, -0000 means local time, +0000 * lib/time.rb: according to RFC2822, -0000 means local time, +0000

27
cont.c
View file

@ -14,6 +14,8 @@
#include "gc.h" #include "gc.h"
#include "eval_intern.h" #include "eval_intern.h"
#define CAPTURE_JUST_VALID_VM_STACK 1
enum context_type { enum context_type {
CONTINUATION_CONTEXT = 0, CONTINUATION_CONTEXT = 0,
FIBER_CONTEXT = 1, FIBER_CONTEXT = 1,
@ -25,6 +27,10 @@ typedef struct rb_context_struct {
VALUE self; VALUE self;
VALUE value; VALUE value;
VALUE *vm_stack; VALUE *vm_stack;
#ifdef CAPTURE_JUST_VALID_VM_STACK
int vm_stack_slen; /* length of stack (head of th->stack) */
int vm_stack_clen; /* length of control frames (tail of th->stack) */
#endif
VALUE *machine_stack; VALUE *machine_stack;
VALUE *machine_stack_src; VALUE *machine_stack_src;
#ifdef __ia64 #ifdef __ia64
@ -75,8 +81,13 @@ cont_mark(void *ptr)
rb_thread_mark(&cont->saved_thread); rb_thread_mark(&cont->saved_thread);
if (cont->vm_stack) { if (cont->vm_stack) {
#ifdef CAPTURE_JUST_VALID_VM_STACK
rb_gc_mark_locations(cont->vm_stack, rb_gc_mark_locations(cont->vm_stack,
cont->vm_stack + cont->saved_thread.stack_size); cont->vm_stack + cont->vm_stack_slen + cont->vm_stack_clen);
#elif
rb_gc_mark_localtion(cont->vm_stack,
cont->vm_stack, cont->saved_thread.stack_size);
#endif
} }
if (cont->machine_stack) { if (cont->machine_stack) {
@ -247,8 +258,16 @@ cont_capture(volatile int *stat)
contval = cont->self; contval = cont->self;
sth = &cont->saved_thread; sth = &cont->saved_thread;
#ifdef CAPTURE_JUST_VALID_VM_STACK
cont->vm_stack_slen = th->cfp->sp + th->mark_stack_len - th->stack;
cont->vm_stack_clen = th->stack + th->stack_size - (VALUE*)th->cfp;
cont->vm_stack = ALLOC_N(VALUE, cont->vm_stack_slen + cont->vm_stack_clen);
MEMCPY(cont->vm_stack, th->stack, VALUE, cont->vm_stack_slen);
MEMCPY(cont->vm_stack + cont->vm_stack_slen, (VALUE*)th->cfp, VALUE, cont->vm_stack_clen);
#elif
cont->vm_stack = ALLOC_N(VALUE, th->stack_size); cont->vm_stack = ALLOC_N(VALUE, th->stack_size);
MEMCPY(cont->vm_stack, th->stack, VALUE, th->stack_size); MEMCPY(cont->vm_stack, th->stack, VALUE, th->stack_size);
#endif
sth->stack = 0; sth->stack = 0;
cont_save_machine_stack(th, cont); cont_save_machine_stack(th, cont);
@ -288,7 +307,13 @@ cont_restore_1(rb_context_t *cont)
th->stack_size = fcont->saved_thread.stack_size; th->stack_size = fcont->saved_thread.stack_size;
th->stack = fcont->saved_thread.stack; th->stack = fcont->saved_thread.stack;
} }
#ifdef CAPTURE_JUST_VALID_VM_STACK
MEMCPY(th->stack, cont->vm_stack, VALUE, cont->vm_stack_slen);
MEMCPY(th->stack + sth->stack_size - cont->vm_stack_clen,
cont->vm_stack + cont->vm_stack_slen, VALUE, cont->vm_stack_clen);
#elif
MEMCPY(th->stack, cont->vm_stack, VALUE, sth->stack_size); MEMCPY(th->stack, cont->vm_stack, VALUE, sth->stack_size);
#endif
} }
else { else {
/* fiber */ /* fiber */