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

merge revision(s) 21354:

Browse source 
* eval.c (stack_extend): streamlined rb_thread_restore_context()
	  to ensure O(1) time.  based on a patch by Brent Roman <brent AT
	  mbari.org>.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@22544 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2009-02-22 13:10:04 +00:00
parent cb016e3224
commit ebe322b171
3 changed files with 51 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Sun Feb 22 22:08:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (stack_extend): streamlined rb_thread_restore_context()
to ensure O(1) time. based on a patch by Brent Roman <brent AT
mbari.org>.
Sun Feb 22 22:03:40 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Sun Feb 22 22:03:40 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (cc_mark): frees the continuation's stack if its thread * eval.c (cc_mark): frees the continuation's stack if its thread

79
eval.c
View file

@ -10631,9 +10631,8 @@ rb_thread_save_context(th)
th->safe = ruby_safe_level; th->safe = ruby_safe_level;
th->node = ruby_current_node; th->node = ruby_current_node;
if (ruby_sandbox_save != NULL) if (ruby_sandbox_save != NULL) {
{ ruby_sandbox_save(th);
ruby_sandbox_save(th);
} }
} }
@ -10681,20 +10680,19 @@ rb_thread_switch(n)
(rb_thread_switch(ruby_setjmp(rb_thread_save_context(th), (th)->context))) (rb_thread_switch(ruby_setjmp(rb_thread_save_context(th), (th)->context)))
NORETURN(static void rb_thread_restore_context _((rb_thread_t,int))); NORETURN(static void rb_thread_restore_context _((rb_thread_t,int)));
NORETURN(NOINLINE(static void rb_thread_restore_context_0(rb_thread_t,int,void*))); NORETURN(NOINLINE(static void rb_thread_restore_context_0(rb_thread_t,int)));
NORETURN(NOINLINE(static void stack_extend(rb_thread_t, int, VALUE *))); NORETURN(NOINLINE(static void stack_extend(rb_thread_t, int)));
static void static void
rb_thread_restore_context_0(rb_thread_t th, int exit, void *vp) rb_thread_restore_context_0(rb_thread_t th, int exit)
{ {
static rb_thread_t tmp; static rb_thread_t tmp;
static int ex; static int ex;
static VALUE tval; static VALUE tval;
rb_trap_immediate = 0; /* inhibit interrupts from here */ rb_trap_immediate = 0; /* inhibit interrupts from here */
if (ruby_sandbox_restore != NULL) if (ruby_sandbox_restore != NULL) {
{ ruby_sandbox_restore(th);
ruby_sandbox_restore(th);
} }
ruby_frame = th->frame; ruby_frame = th->frame;
ruby_scope = th->scope; ruby_scope = th->scope;
@ -10742,9 +10740,9 @@ 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);
int rb_dummy_false = 0; int rb_dummy_false = 0;
NORETURN(NOINLINE(static void register_stack_extend(rb_thread_t, int, void *, VALUE *))); NORETURN(NOINLINE(static void register_stack_extend(rb_thread_t, int, VALUE *)));
static void static void
register_stack_extend(rb_thread_t th, int exit, void *vp, VALUE *curr_bsp) register_stack_extend(rb_thread_t th, int exit, VALUE *curr_bsp)
{ {
if (rb_dummy_false) { if (rb_dummy_false) {
/* use registers as much as possible */ /* use registers as much as possible */
@ -10758,52 +10756,63 @@ register_stack_extend(rb_thread_t th, int exit, void *vp, 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 < th->bstr_pos+th->bstr_len) { if (curr_bsp < th->bstr_pos+th->bstr_len) {
register_stack_extend(th, exit, &exit, (VALUE*)rb_ia64_bsp()); register_stack_extend(th, exit, (VALUE*)rb_ia64_bsp());
} }
rb_thread_restore_context_0(th, exit, &exit); stack_extend(th, exit);
} }
#undef C #undef C
#undef E #undef E
#endif #endif
# if defined(_MSC_VER) && _MSC_VER >= 1300
__declspec(noinline) static void stack_extend(rb_thread_t, int, VALUE*);
# endif
static void static void
stack_extend(rb_thread_t th, int exit, VALUE *addr_in_prev_frame) stack_extend(rb_thread_t th, int exit)
{ {
#define STACK_PAD_SIZE 1024 #define STACK_PAD_SIZE 1024
VALUE space[STACK_PAD_SIZE]; volatile VALUE space[STACK_PAD_SIZE], *sp = space;
#if STACK_GROW_DIRECTION < 0 #if !STACK_GROW_DIRECTION
if (addr_in_prev_frame > th->stk_pos) stack_extend(th, exit, &space[0]); if (space < rb_gc_stack_start) {
#elif STACK_GROW_DIRECTION > 0
if (addr_in_prev_frame < th->stk_pos + th->stk_len) stack_extend(th, exit, &space[STACK_PAD_SIZE-1]);
#else
if (addr_in_prev_frame < rb_gc_stack_start) {
/* Stack grows downward */ /* Stack grows downward */
if (addr_in_prev_frame > th->stk_pos) stack_extend(th, exit, &space[0]); #endif
#if STACK_GROW_DIRECTION <= 0
if (space > th->stk_pos) {
# ifdef HAVE_ALLOCA
sp = ALLOCA_N(VALUE, &space[0] - th->stk_pos);
# else
stack_extend(th, exit);
# endif
}
#endif
#if !STACK_GROW_DIRECTION
} }
else { else {
/* Stack grows upward */ /* Stack grows upward */
if (addr_in_prev_frame < th->stk_pos + th->stk_len) stack_extend(th, exit, &space[STACK_PAD_SIZE-1]); #endif
#if STACK_GROW_DIRECTION >= 0
if (&space[STACK_PAD_SIZE] < th->stk_pos + th->stk_len) {
# ifdef HAVE_ALLOCA
sp = ALLOCA_N(VALUE, th->stk_pos + th->stk_len - &space[STACK_PAD_SIZE]);
# else
stack_extend(th, exit);
# endif
}
#endif
#if !STACK_GROW_DIRECTION
} }
#endif #endif
#ifdef __ia64 rb_thread_restore_context_0(th, exit);
register_stack_extend(th, exit, space, (VALUE*)rb_ia64_bsp());
#else
rb_thread_restore_context_0(th, exit, space);
#endif
} }
#ifdef __ia64
#define stack_extend(th, exit) register_stack_extend(th, exit, (VALUE*)rb_ia64_bsp())
#endif
static void static void
rb_thread_restore_context(th, exit) rb_thread_restore_context(th, exit)
rb_thread_t th; rb_thread_t th;
int exit; int exit;
{ {
VALUE v;
if (!th->stk_ptr) rb_bug("unsaved context"); if (!th->stk_ptr) rb_bug("unsaved context");
stack_extend(th, exit, &v); stack_extend(th, exit);
} }
static void static void
@ -12109,9 +12118,9 @@ rb_thread_group(thread)
th->locals = 0;\ th->locals = 0;\
th->thread = 0;\ th->thread = 0;\
if (curr_thread == 0) {\ if (curr_thread == 0) {\
th->sandbox = Qnil;\ th->sandbox = Qnil;\
} else {\ } else {\
th->sandbox = curr_thread->sandbox;\ th->sandbox = curr_thread->sandbox;\
}\ }\
} while (0) } while (0)

2
version.h
View file

@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2009-02-22" #define RUBY_RELEASE_DATE "2009-02-22"
#define RUBY_VERSION_CODE 187 #define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20090222 #define RUBY_RELEASE_CODE 20090222
#define RUBY_PATCHLEVEL 138 #define RUBY_PATCHLEVEL 139
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_MINOR 8