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

Commits on Nov 1, 2016

  1. Copy the full SHA
    d2df698 View commit details
  2. [Truffle] If we're not doing parallel core load, don't use futures at…

    … all.
    
    It makes profiling output hard to read.
    chrisseaton committed Nov 1, 2016
    Copy the full SHA
    1bcb3dd View commit details
Showing with 8 additions and 10 deletions.
  1. +7 −5 lib/ruby/truffle/truffle/bigdecimal.rb
  2. +1 −5 truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java
12 changes: 7 additions & 5 deletions lib/ruby/truffle/truffle/bigdecimal.rb
Original file line number Diff line number Diff line change
@@ -243,22 +243,24 @@ def to_s(format = 'E')
end

def inspect
precs1, precs2 = precs
sig, max_sig = precs

format "#<BigDecimal:%s,'%s',%d(%d)>",
object_id.to_s(16),
to_s,
precs1,
precs2
sig,
max_sig
end

def _dump(level=nil)
# TODO (pitr 30-jun-2015): increase density
to_s
sig, max_sig = precs
str = to_s
"#{max_sig}:#{to_s}".force_encoding(str.encoding)
end

def self._load(data)
new data
new(data.split(':').last)
end

private
Original file line number Diff line number Diff line change
@@ -983,7 +983,7 @@ public void loadRubyCore() {
@SuppressWarnings("unchecked")
final Future<RubyRootNode>[] coreFileFutures = new Future[coreFiles.length];

if (TruffleOptions.AOT) {
if (TruffleOptions.AOT || !context.getOptions().CORE_PARALLEL_LOAD) {
try {
for (int n = 0; n < coreFiles.length; n++) {
final RubyRootNode rootNode = context.getCodeLoader().parse(
@@ -1012,10 +1012,6 @@ public void loadRubyCore() {
context.getSourceCache().getSource(getCoreLoadPath() + coreFiles[finalN]),
UTF8Encoding.INSTANCE, ParserContext.TOP_LEVEL, null, true, node)
);

if (!context.getOptions().CORE_PARALLEL_LOAD) {
coreFileFutures[n].get();
}
}

for (int n = 0; n < coreFiles.length; n++) {