From f7f3f9bf76467190c34fc598fd48ebedf3db9f42 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 9 Sep 2009 01:51:49 +0000 Subject: [PATCH] * cont.c (cont_restore_1, rb_cont_call): should be Fiber. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24799 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ cont.c | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index e18690458e..f5ef8bb432 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Sep 9 10:51:46 2009 Nobuyoshi Nakada + + * cont.c (cont_restore_1, rb_cont_call): should be Fiber. + Wed Sep 9 00:27:29 2009 Nobuyoshi Nakada * cont.c (cont_data_type, fiber_data_type): typed. diff --git a/cont.c b/cont.c index 82784dc870..10a8df1754 100644 --- a/cont.c +++ b/cont.c @@ -356,10 +356,10 @@ cont_restore_1(rb_context_t *cont) fib = th->fiber ? th->fiber : th->root_fiber; if (fib) { - rb_context_t *fcont; - GetContPtr(fib, fcont); - th->stack_size = fcont->saved_thread.stack_size; - th->stack = fcont->saved_thread.stack; + rb_fiber_t *fcont; + GetFiberPtr(fib, fcont); + th->stack_size = fcont->cont.saved_thread.stack_size; + th->stack = fcont->cont.saved_thread.stack; } #ifdef CAPTURE_JUST_VALID_VM_STACK MEMCPY(th->stack, cont->vm_stack, VALUE, cont->vm_stack_slen); @@ -620,8 +620,8 @@ rb_cont_call(int argc, VALUE *argv, VALUE contval) rb_raise(rb_eRuntimeError, "continuation called across trap"); } if (cont->saved_thread.fiber) { - rb_context_t *fcont; - GetContPtr(cont->saved_thread.fiber, fcont); + rb_fiber_t *fcont; + GetFiberPtr(cont->saved_thread.fiber, fcont); if (th->fiber != cont->saved_thread.fiber) { rb_raise(rb_eRuntimeError, "continuation called across fiber");