Project

General

Profile

Feature #2294 » ruby_bind_stack_after_refactoring.patch

sunaku (Suraj Kurapati), 10/31/2009 02:25 PM

View differences:

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;
void
ruby_bind_stack(void *lower, void *upper)
{
assert(upper > lower);
ruby_stack_lower_bound = lower;
ruby_stack_upper_bound = upper;
}
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 (th == th->vm->main_thread) {
if (ruby_stack_lower_bound && *stack_start < ruby_stack_lower_bound) {
*stack_start = ruby_stack_lower_bound;
}
if (ruby_stack_upper_bound && *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 Ruby's stack to the region of memory that spans from the given
* "lower" boundary up to (but not including) the given "upper" boundary.
* Note that these boundaries _do not_ protect against stack overflow!
*/
void ruby_bind_stack(void *lower, void *upper);
void ruby_init(void);
void *ruby_options(int, char**);
int ruby_run_node(void *);
(15-15/26)