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_restore_0): streamlined to ensure O(1) time. based on

Browse source 
a patch by Brent Roman <brent AT mbari.org>.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21355 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-01-06 10:09:54 +00:00
parent 1fffe3d399
commit 53716bfce7
2 changed files with 33 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Jan 6 19:09:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* cont.c (cont_restore_0): streamlined to ensure O(1) time. based on
a patch by Brent Roman <brent AT mbari.org>.
Tue Jan 6 00:34:25 2009 Tanaka Akira <akr@fsij.org> Tue Jan 6 00:34:25 2009 Tanaka Akira <akr@fsij.org>
* io.c (rb_close_before_exec): more heuristics to detect maximum fd. * io.c (rb_close_before_exec): more heuristics to detect maximum fd.

46
cont.c
View file

@ -371,10 +371,13 @@ static volatile int C(a), C(b), C(c), C(d), C(e);
static volatile int C(f), C(g), C(h), C(i), C(j); static volatile int C(f), C(g), C(h), C(i), C(j);
static volatile int C(k), C(l), C(m), C(n), C(o); static volatile int C(k), C(l), C(m), C(n), C(o);
static volatile int C(p), C(q), C(r), C(s), C(t); static volatile int C(p), C(q), C(r), C(s), C(t);
#if 0
{/* the above lines make cc-mode.el confused so much */}
#endif
int rb_dummy_false = 0; int rb_dummy_false = 0;
NORETURN(NOINLINE(static void register_stack_extend(rb_context_t *, VALUE *))); NORETURN(NOINLINE(static void register_stack_extend(rb_context_t *, VALUE *)));
static void static void
register_stack_extend(rb_context_t *cont, VALUE *curr_bsp) register_stack_extend(rb_context_t *cont, VALUE *vp, VALUE *curr_bsp)
{ {
if (rb_dummy_false) { if (rb_dummy_false) {
/* use registers as much as possible */ /* use registers as much as possible */
@ -388,9 +391,9 @@ register_stack_extend(rb_context_t *cont, VALUE *curr_bsp)
E(p) = E(q) = E(r) = E(s) = E(t) = 0; E(p) = E(q) = E(r) = E(s) = E(t) = 0;
} }
if (curr_bsp < cont->machine_register_stack_src+cont->machine_register_stack_size) { if (curr_bsp < cont->machine_register_stack_src+cont->machine_register_stack_size) {
register_stack_extend(cont, (VALUE*)rb_ia64_bsp()); register_stack_extend(cont, vp, (VALUE*)rb_ia64_bsp());
} }
cont_restore_1(cont); cont_restore_0(cont, vp);
} }
#undef C #undef C
#undef E #undef E
@ -403,35 +406,42 @@ cont_restore_0(rb_context_t *cont, VALUE *addr_in_prev_frame)
#define STACK_PAD_SIZE 1024 #define STACK_PAD_SIZE 1024
VALUE space[STACK_PAD_SIZE]; VALUE space[STACK_PAD_SIZE];
#if STACK_GROW_DIRECTION < 0 /* downward */ #if !STACK_GROW_DIRECTION
if (addr_in_prev_frame > cont->machine_stack_src) {
cont_restore_0(cont, &space[0]);
}
#elif STACK_GROW_DIRECTION > 0 /* upward */
if (addr_in_prev_frame < cont->machine_stack_src + cont->machine_stack_size) {
cont_restore_0(cont, &space[STACK_PAD_SIZE-1]);
}
#else
if (addr_in_prev_frame > &space[0]) { if (addr_in_prev_frame > &space[0]) {
/* Stack grows downward */ /* Stack grows downward */
if (addr_in_prev_frame > cont->machine_stack_src) { #endif
#if STACK_GROW_DIRECTION <= 0
if (&space[0] > cont->machine_stack_src) {
# ifdef HAVE_ALLOCA
ALLOCA_N(VALUE, &space[0] - cont->machine_stack_src);
# else
cont_restore_0(cont, &space[0]); cont_restore_0(cont, &space[0]);
# endif
} }
#endif
#if !STACK_GROW_DIRECTION
} }
else { else {
/* Stack grows upward */ /* Stack grows upward */
if (addr_in_prev_frame < cont->machine_stack_src + cont->machine_stack_size) { #endif
#if STACK_GROW_DIRECTION >= 0
if (&space[STACK_PAD_SIZE] < cont->machine_stack_src + cont->machine_stack_size) {
# ifdef HAVE_ALLOCA
ALLOCA_N(VALUE, cont->machine_stack_src + cont->machine_stack_size - &space[STACK_PAD_SIZE]);
# else
cont_restore_0(cont, &space[STACK_PAD_SIZE-1]); cont_restore_0(cont, &space[STACK_PAD_SIZE-1]);
# endif
} }
#endif
#if !STACK_GROW_DIRECTION
} }
#endif #endif
} }
#ifdef __ia64
register_stack_extend(cont, (VALUE*)rb_ia64_bsp());
#else
cont_restore_1(cont); cont_restore_1(cont);
#endif
} }
#ifdef __ia64
#define cont_restore_0(cont, vp) register_stack_extend(cont, vp, (VALUE*)rb_ia64_bsp());
#endif
/* /*
* Document-class: Continuation * Document-class: Continuation