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: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ce2bc73ef0a6
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ce6903f61fd6
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Feb 28, 2015

  1. [Truffle] Add jt --server option to run the instrumentation server.

    @chrisseaton
    chrisseaton committed Feb 28, 2015
    Copy the full SHA
    b38043e View commit details

  2. [Truffle] Don't try to access the current frame as fast path.

    @chrisseaton
    chrisseaton committed Feb 28, 2015
    Copy the full SHA
    ce6903f View commit details
Showing with 6 additions and 1 deletion.
  1. +5 −0 tool/jt.rb
  2. +1 −1 truffle/src/main/java/org/jruby/truffle/runtime/subsystems/InstrumentationServerManager.java
5 changes: 5 additions & 0 deletions tool/jt.rb
View file
Original file line number Diff line number Diff line change
@@ -97,6 +97,7 @@ def help
puts 'jt run [options] args... run JRuby with -X+T and args'
puts ' --graal use Graal (set GRAAL_BIN or it will try to automagically find it)'
puts ' --asm show assembly (implies --graal)'
puts ' --server run an instrumentation server on port 8080'
puts 'jt test run all specs'
puts 'jt test fast run all specs except sub-processes, GC, sleep, ...'
puts 'jt test spec/ruby/language run specs in this directory'
@@ -155,6 +156,10 @@ def run(*args)
jruby_args += %w[-J-XX:+UnlockDiagnosticVMOptions -J-XX:CompileCommand=print,*::callRoot]
end

if args.delete('--server')
jruby_args += %w[-Xtruffle.instrumentation_server_port=8080 -Xtruffle.passalot=1]
end

raw_sh(env_vars, "#{JRUBY_DIR}/bin/jruby", *jruby_args, *args)
end

2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/runtime/subsystems/InstrumentationServerManager.java
View file
Original file line number Diff line number Diff line change
@@ -114,7 +114,7 @@ public void run(RubyThread thread, final Node currentNode) {
@Override
public void run() {
new SimpleShell(context).run(Truffle.getRuntime().getCurrentFrame()
.getFrame(FrameInstance.FrameAccess.MATERIALIZE, false).materialize(), currentNode);
.getFrame(FrameInstance.FrameAccess.MATERIALIZE, true).materialize(), currentNode);
}

});