Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rubinius/rubinius
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6c8d58228b54
Choose a base ref
...
head repository: rubinius/rubinius
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bf11021fc5a4
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 13, 2016

  1. Copy the full SHA
    e7bf303 View commit details
  2. Copy the full SHA
    bf11021 View commit details
Showing with 16 additions and 11 deletions.
  1. +1 −1 library/rubinius/configuration.rb
  2. +15 −10 machine/builtin/location.cpp
2 changes: 1 addition & 1 deletion library/rubinius/configuration.rb
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@
s.vm_variable "large_object", (1024 * 1024),
"The size (in bytes) of the large object threshold"

s.vm_variable "immix.concurrent", true,
s.vm_variable "immix.concurrent", false,
"Set whether we want the Immix mark phase to run concurrently"

s.vm_variable "immix.debug", :bool,
25 changes: 15 additions & 10 deletions machine/builtin/location.cpp
Original file line number Diff line number Diff line change
@@ -95,12 +95,15 @@ namespace rubinius {
base = base->previous;
}

if(!base) return nil<Array>();
if(count == 0) return nil<Array>();

Array* array = Array::create(state, count);
bool first = true;

for(CallFrame* frame = base; frame; frame = frame->previous) {
for(CallFrame* frame = state->vm()->call_frame();
frame;
frame = frame->previous)
{
if(frame->compiled_code) {
if(Location* location = Location::create(state, frame, true)) {
if(first) {
@@ -121,22 +124,23 @@ namespace rubinius {

Array* Location::from_call_stack(STATE, ssize_t up) {
CallFrame* base = state->vm()->call_frame();
CallFrame* start = base;
size_t count = 0;

while(base) {
if(up-- > 0) {
// ignore this frame
start = base = base->previous;
} else {
count++;
base = base->previous;
}
base = base->previous;
}

if(!base) return nil<Array>();
if(count == 0) return nil<Array>();

Array* array = Array::create(state, count);

for(CallFrame* frame = base; frame; frame = frame->previous) {
for(CallFrame* frame = start; frame; frame = frame->previous) {
if(frame->compiled_code) {
array->append(state, Location::create(state, frame));
} else if(NativeMethodFrame* nmf = frame->native_method_frame()) {
@@ -151,22 +155,23 @@ namespace rubinius {

Array* Location::mri_backtrace(STATE, ssize_t up) {
CallFrame* base = state->vm()->call_frame();
CallFrame* start = base;
size_t count = 0;

while(base) {
if(up-- > 0) {
// ignore this frame
start = base = base->previous;
} else {
count++;
base = base->previous;
}
base = base->previous;
}

if(!base) return nil<Array>();
if(count == 0) return nil<Array>();

Array* array = Array::create(state, count);

for(CallFrame* frame = base; frame; frame = frame->previous) {
for(CallFrame* frame = start; frame; frame = frame->previous) {
if(frame->compiled_code && !frame->compiled_code->core_method(state)) {
Symbol* name;
Object* block = cFalse;