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

Commits on Sep 17, 2015

  1. [Truffle] Shim ENV_JAVA

    chrisseaton committed Sep 17, 2015
    Copy the full SHA
    036adfe View commit details
  2. [Truffle] Posix.close

    chrisseaton committed Sep 17, 2015
    Copy the full SHA
    e83a60e View commit details
  3. Copy the full SHA
    ae0e3b4 View commit details
90 changes: 0 additions & 90 deletions test/truffle/subjects/big-tree.rb

This file was deleted.

21 changes: 0 additions & 21 deletions test/truffle/subjects/client.rb

This file was deleted.

Original file line number Diff line number Diff line change
@@ -7,11 +7,22 @@
# GNU General Public License version 2
# GNU Lesser General Public License version 2.1

# Serves a single request then shuts down. Useful with client.rb to make that
# request.
# Serves a single request then shuts down. Provides both the client and the
# server.

require 'open-uri'
require 'webrick'

Thread.new do
loop do
begin
open('http://localhost:8000/hello').read
break
rescue
end
end
end

server = WEBrick::HTTPServer.new(Port: 8000)

server.mount_proc '/hello' do |req, res|
Original file line number Diff line number Diff line change
@@ -1115,4 +1115,19 @@ public int getSockOptionsSymbols(VirtualFrame frame, int sockfd, DynamicObject l

}

@CoreMethod(names = "close", isModuleFunction = true, required = 1)
public abstract static class CloseNode extends CoreMethodArrayArgumentsNode {

public CloseNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
}

@CompilerDirectives.TruffleBoundary
@Specialization
public int close(int file) {
return posix().close(file);
}

}

}
4 changes: 4 additions & 0 deletions truffle/src/main/ruby/core/shims.rb
Original file line number Diff line number Diff line change
@@ -247,3 +247,7 @@ def inplace_mode=(ext)
end

end

# JRuby uses this for example to make proxy settings visible to stdlib/uri/common.rb

ENV_JAVA = {}