Skip to content

Commit

Permalink
Showing 2 changed files with 10 additions and 1 deletion.
3 changes: 3 additions & 0 deletions library/rubinius/configuration.rb
Original file line number Diff line number Diff line change
@@ -146,6 +146,9 @@
s.section "profiler" do |p|
p.vm_variable "target", "none",
"Location to send profiler output: path"

p.vm_variable "subprocess", false,
"Enable profiling in subprocesses created by fork"
end
end
end
8 changes: 7 additions & 1 deletion machine/shared_state.cpp
Original file line number Diff line number Diff line change
@@ -198,7 +198,13 @@ namespace rubinius {
signals_->after_fork_child(state);
console_->after_fork_child(state);

if(profiler_enabled_p()) set_profiler_path();
if(profiler_enabled_p()) {
if(config.system_profiler_subprocess.value) {
set_profiler_path();
} else {
profiler_enabled_ = false;
}
}
}

const unsigned int* SharedState::object_memory_mark_address() const {

0 comments on commit 60316bb

Please sign in to comment.