ruby-changes:13825
From: wanabe <ko1@a...>
Date: Mon, 2 Nov 2009 08:27:27 +0900 (JST)
Subject: [ruby-changes:13825] Ruby:r25623 (trunk): * cont.c (fiber_free): don't free unallocated local_storage. see #1325.
wanabe 2009-11-02 08:27:12 +0900 (Mon, 02 Nov 2009) New Revision: 25623 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25623 Log: * cont.c (fiber_free): don't free unallocated local_storage. see #1325. * cont.c (cont_init): clear local_storage not to use current thread's. * cont.c (fiber_t_alloc, root_fiber_alloc): link itself always for a case that fiber_link_remove() is called before fiber_link_join(). * cont.c (fiber_init): don't join half-baked fiber. Modified files: trunk/ChangeLog trunk/cont.c Index: ChangeLog =================================================================== --- ChangeLog (revision 25622) +++ ChangeLog (revision 25623) @@ -1,3 +1,14 @@ +Mon Nov 2 08:17:31 2009 wanabe <s.wanabe@g...> + + * cont.c (fiber_free): don't free unallocated local_storage. see #1325. + + * cont.c (cont_init): clear local_storage not to use current thread's. + + * cont.c (fiber_t_alloc, root_fiber_alloc): link itself always for + a case that fiber_link_remove() is called before fiber_link_join(). + + * cont.c (fiber_init): don't join half-baked fiber. + Sun Nov 1 20:16:03 2009 NARUSE, Yui <naruse@r...> * ext/bigdecimal/bigdecimal.c: fixed rdoc. [ruby-core:26457] Index: cont.c =================================================================== --- cont.c (revision 25622) +++ cont.c (revision 25623) @@ -198,7 +198,8 @@ if (ptr) { rb_fiber_t *fib = ptr; - if (fib->cont.type != ROOT_FIBER_CONTEXT) { + if (fib->cont.type != ROOT_FIBER_CONTEXT && + fib->cont.saved_thread.local_storage) { st_free_table(fib->cont.saved_thread.local_storage); } fiber_link_remove(fib); @@ -283,6 +284,7 @@ { /* save thread context */ cont->saved_thread = *th; + cont->saved_thread.local_storage = 0; } static rb_context_t * @@ -731,6 +733,7 @@ cont_init(&fib->cont, th); fib->prev = Qnil; fib->status = CREATED; + fib->prev_fiber = fib->next_fiber = fib; DATA_PTR(fibval) = fib; @@ -744,8 +747,6 @@ rb_context_t *cont = &fib->cont; rb_thread_t *th = &cont->saved_thread; - fiber_link_join(fib); - /* initialize cont */ cont->vm_stack = 0; @@ -753,6 +754,8 @@ th->stack_size = FIBER_VM_STACK_SIZE; th->stack = ALLOC_N(VALUE, th->stack_size); + fiber_link_join(fib); + th->cfp = (void *)(th->stack + th->stack_size); th->cfp--; th->cfp->pc = 0; @@ -875,7 +878,6 @@ /* no need to allocate vm stack */ fib = fiber_t_alloc(fiber_alloc(rb_cFiber)); fib->cont.type = ROOT_FIBER_CONTEXT; - fib->prev_fiber = fib->next_fiber = fib; return fib; } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/