Feature #2294 » ruby_bind_stack_after_refactoring.patch
| ChangeLog | ||
|---|---|---|
|
Mon Oct 25 13:28:00 2009 Suraj N. Kurapati <sunaku@gmail.com>
|
||
|
* include/ruby/ruby.h: declare ruby_bind_stack(). [ruby-core:26361]
|
||
|
* gc.c: implement ruby_bind_stack(). restrict GC marking
|
||
|
region to ruby_bind_stack() boundaries for main thread.
|
||
|
Mon Oct 25 13:28:00 2009 Suraj N. Kurapati <sunaku@gmail.com>
|
||
|
* gc.c: refactor common code from mark_current_machine_context()
|
||
|
and rb_gc_mark_machine_stack() into get_machine_stack_bounds().
|
||
| gc.c | ||
|---|---|---|
|
#include "eval_intern.h"
|
||
|
#include "vm_core.h"
|
||
|
#include "gc.h"
|
||
|
#include <assert.h>
|
||
|
#include <stdio.h>
|
||
|
#include <setjmp.h>
|
||
|
#include <sys/types.h>
|
||
| ... | ... | |
|
void rb_vm_mark(void *ptr);
|
||
|
static VALUE *ruby_stack_lower_bound = 0, *ruby_stack_upper_bound = 0;
|
||
|
static char ruby_stack_is_bound = 0;
|
||
|
void
|
||
|
ruby_bind_stack(void *lower_boundary, void *upper_boundary)
|
||
|
{
|
||
|
assert(upper_boundary > lower_boundary && lower_boundary > 0);
|
||
|
ruby_stack_lower_bound = lower_boundary;
|
||
|
ruby_stack_upper_bound = upper_boundary;
|
||
|
ruby_stack_is_bound = 1;
|
||
|
}
|
||
|
static void
|
||
|
get_machine_stack_bounds(rb_thread_t *th, VALUE **stack_start, VALUE **stack_end, unsigned stack_end_increment)
|
||
|
{
|
||
| ... | ... | |
|
*stack_end = th->machine_stack_end + stack_end_increment;
|
||
|
}
|
||
|
#endif
|
||
|
if (ruby_stack_is_bound && th == th->vm->main_thread) {
|
||
|
if (*stack_start < ruby_stack_lower_bound) {
|
||
|
*stack_start = ruby_stack_lower_bound;
|
||
|
}
|
||
|
if (*stack_end > ruby_stack_upper_bound) {
|
||
|
*stack_end = ruby_stack_upper_bound;
|
||
|
}
|
||
|
}
|
||
|
}
|
||
|
static void
|
||
| include/ruby/ruby.h | ||
|---|---|---|
|
#define RUBY_INIT_STACK \
|
||
|
VALUE variable_in_this_stack_frame; \
|
||
|
ruby_init_stack(&variable_in_this_stack_frame);
|
||
|
/*
|
||
|
* Binds the stack of Ruby's main thread to the region of memory that spans
|
||
|
* inclusively from the given lower boundary to the given upper boundary:
|
||
|
*
|
||
|
* lower boundary <= stack pointer of Ruby's main thread <= upper boundary
|
||
|
*
|
||
|
* These boundaries *do not* protect Ruby's main thread against stack
|
||
|
* overflow and they *do not* apply to non-main Ruby threads (whose stacks
|
||
|
* are dynamically allocated and managed by the native Operating System).
|
||
|
*/
|
||
|
void ruby_bind_stack(void *lower_boundary, void *upper_boundary);
|
||
|
void ruby_init(void);
|
||
|
void *ruby_options(int, char**);
|
||
|
int ruby_run_node(void *);
|
||