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 r25623

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25625 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
wanabe 2009-11-02 01:04:31 +00:00
parent 3e364a0c8b
commit 71f0685fe3
2 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,14 +1,3 @@
Mon Nov 2 08:17:31 2009 wanabe <s.wanabe@gmail.com>
* 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@ruby-lang.org>
* ext/bigdecimal/bigdecimal.c: fixed rdoc. [ruby-core:26457]

10
cont.c
View file

@ -198,8 +198,7 @@ fiber_free(void *ptr)
if (ptr) {
rb_fiber_t *fib = ptr;
if (fib->cont.type != ROOT_FIBER_CONTEXT &&
fib->cont.saved_thread.local_storage) {
if (fib->cont.type != ROOT_FIBER_CONTEXT) {
st_free_table(fib->cont.saved_thread.local_storage);
}
fiber_link_remove(fib);
@ -284,7 +283,6 @@ cont_init(rb_context_t *cont, rb_thread_t *th)
{
/* save thread context */
cont->saved_thread = *th;
cont->saved_thread.local_storage = 0;
}
static rb_context_t *
@ -733,7 +731,6 @@ fiber_t_alloc(VALUE fibval)
cont_init(&fib->cont, th);
fib->prev = Qnil;
fib->status = CREATED;
fib->prev_fiber = fib->next_fiber = fib;
DATA_PTR(fibval) = fib;
@ -747,6 +744,8 @@ fiber_init(VALUE fibval, VALUE proc)
rb_context_t *cont = &fib->cont;
rb_thread_t *th = &cont->saved_thread;
fiber_link_join(fib);
/* initialize cont */
cont->vm_stack = 0;
@ -754,8 +753,6 @@ fiber_init(VALUE fibval, VALUE proc)
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;
@ -878,6 +875,7 @@ root_fiber_alloc(rb_thread_t *th)
/* 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;
}