diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-22 12:11:06 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-22 12:11:06 +0000 |
commit | 93a44fb29e1a5c293a8cd7f2da7e81d2f010c9b0 (patch) | |
tree | d681285348d1abbac4c80aeb4b557de27b5117e0 /cont.c | |
parent | 4675927981a7be5bd6a44e185527ce3e93d76933 (diff) |
merges r20256 from trunk into ruby_1_9_1.
* cont.c (cont_mark, cont_capture, cont_restore_1): speed up
continuation by copying only valid YARV stack. [ruby-dev:37106]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20307 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'cont.c')
-rw-r--r-- | cont.c | 27 |
1 files changed, 26 insertions, 1 deletions
@@ -14,6 +14,8 @@ #include "gc.h" #include "eval_intern.h" +#define CAPTURE_JUST_VALID_VM_STACK 1 + enum context_type { CONTINUATION_CONTEXT = 0, FIBER_CONTEXT = 1, @@ -25,6 +27,10 @@ typedef struct rb_context_struct { VALUE self; VALUE value; 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_src; #ifdef __ia64 @@ -75,8 +81,13 @@ cont_mark(void *ptr) rb_thread_mark(&cont->saved_thread); if (cont->vm_stack) { +#ifdef CAPTURE_JUST_VALID_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) { @@ -247,8 +258,16 @@ cont_capture(volatile int *stat) contval = cont->self; 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); MEMCPY(cont->vm_stack, th->stack, VALUE, th->stack_size); +#endif sth->stack = 0; 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 = 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); +#endif } else { /* fiber */ |