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

Commits on Apr 4, 2016

  1. [Truffle] Separate cache option for the interop write node.

    @chrisseaton
    chrisseaton committed Apr 4, 2016
    Copy the full SHA
    169962d View commit details

  2. [Truffle] Tidy up Truffle::Interop.executable?

    @chrisseaton
    chrisseaton committed Apr 4, 2016
    Copy the full SHA
    edf7c41 View commit details

  3. [Truffle] Tidy up Truffle::Interop.execute

    @chrisseaton
    chrisseaton committed Apr 4, 2016
    Copy the full SHA
    2aa92ca View commit details

  4. [Truffle] Tidy up Truffle::Interop.size?

    @chrisseaton
    chrisseaton committed Apr 4, 2016
    Copy the full SHA
    83c05aa View commit details

  5. [Truffle] Tidy up Truffle::Interop.size

    @chrisseaton
    chrisseaton committed Apr 4, 2016
    Copy the full SHA
    9912e6b View commit details

  6. [Truffle] Tidy up Truffle::Interop.unbox

    @chrisseaton
    chrisseaton committed Apr 4, 2016
    Copy the full SHA
    3fc8416 View commit details

  7. [Truffle] Tidy up Truffle::Interop.boxed?

    @chrisseaton
    chrisseaton committed Apr 4, 2016
    Copy the full SHA
    9939a71 View commit details

  8. [Truffle] Tidy up Truffle::Interop.null?

    @chrisseaton
    chrisseaton committed Apr 4, 2016
    Copy the full SHA
    60203bd View commit details

  9. [Truffle] Tidy up Truffle::Interop.read

    @chrisseaton
    chrisseaton committed Apr 4, 2016
    Copy the full SHA
    6bc3d87 View commit details

  10. [Truffle] Remove old unbox node.

    @chrisseaton
    chrisseaton committed Apr 4, 2016
    Copy the full SHA
    a7f8c32 View commit details

  11. [Truffle] Tidy up Truffle::Interop.write

    @chrisseaton
    chrisseaton committed Apr 4, 2016
    Copy the full SHA
    54017c7 View commit details

  12. [Truffle] Tidy up interop export and import.

    @chrisseaton
    chrisseaton committed Apr 4, 2016
    Copy the full SHA
    9c5bdfe View commit details

  13. [Truffle] I don't think anyone is using interop_to_ruby_primitive.

    @chrisseaton
    chrisseaton committed Apr 4, 2016
    Copy the full SHA
    2813751 View commit details

  14. [Truffle] java_string_to_ruby isn't needed.

    @chrisseaton
    chrisseaton committed Apr 4, 2016
    Copy the full SHA
    79bbf32 View commit details
1 change: 1 addition & 0 deletions core/src/main/java/org/jruby/util/cli/Options.java
View file
Original file line number Diff line number Diff line change
@@ -263,6 +263,7 @@ public class Options {
public static final Option<Integer> TRUFFLE_INTEROP_CONVERT_CACHE = integer(TRUFFLE, "truffle.interop.convert.cache", TRUFFLE_DEFAULT_CACHE.load(), "Cache size for converting values for interop.");
public static final Option<Integer> TRUFFLE_INTEROP_EXECUTE_CACHE = integer(TRUFFLE, "truffle.interop.execute.cache", TRUFFLE_DEFAULT_CACHE.load(), "Cache size for interop EXECUTE messages.");
public static final Option<Integer> TRUFFLE_INTEROP_READ_CACHE = integer(TRUFFLE, "truffle.interop.read.cache", TRUFFLE_DEFAULT_CACHE.load(), "Cache size for interop READ messages.");
public static final Option<Integer> TRUFFLE_INTEROP_WRITE_CACHE = integer(TRUFFLE, "truffle.interop.write.cache", TRUFFLE_DEFAULT_CACHE.load(), "Cache size for interop WRITE messages.");

public static final Option<Boolean> TRUFFLE_CLONE_DEFAULT = bool(TRUFFLE, "truffle.clone.default", true, "Default option for cloning.");
public static final Option<Boolean> TRUFFLE_INLINE_DEFAULT = bool(TRUFFLE, "truffle.inline.default", true, "Default option for inlining.");
2 changes: 1 addition & 1 deletion lib/ruby/truffle/truffle/truffle/execjs.rb
View file
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@ def unbox(value)
if Truffle::Interop.boxed_primitive?(value)
Truffle::Interop.unbox_value(value)
else
JSON.parse(Truffle::Interop.java_string_to_ruby(STRINGIFY.call(STRINGIFY, value)))
JSON.parse(Truffle::Interop.unbox(STRINGIFY.call(STRINGIFY, value)))
end
end

2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/interop/ForeignWriteNode.java
View file
Original file line number Diff line number Diff line change
@@ -181,7 +181,7 @@ protected boolean startsWithAt(String label) {
}

protected int getCacheLimit() {
return getContext().getOptions().INTEROP_READ_CACHE;
return getContext().getOptions().INTEROP_WRITE_CACHE;
}

}
518 changes: 253 additions & 265 deletions truffle/src/main/java/org/jruby/truffle/interop/TruffleInteropNodes.java
View file

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions truffle/src/main/java/org/jruby/truffle/language/Options.java
View file
Original file line number Diff line number Diff line change
@@ -40,6 +40,7 @@
import static org.jruby.util.cli.Options.TRUFFLE_INTEROP_CONVERT_CACHE;
import static org.jruby.util.cli.Options.TRUFFLE_INTEROP_EXECUTE_CACHE;
import static org.jruby.util.cli.Options.TRUFFLE_INTEROP_READ_CACHE;
import static org.jruby.util.cli.Options.TRUFFLE_INTEROP_WRITE_CACHE;
import static org.jruby.util.cli.Options.TRUFFLE_IS_A_CACHE;
import static org.jruby.util.cli.Options.TRUFFLE_METHODMISSING_ALWAYS_CLONE;
import static org.jruby.util.cli.Options.TRUFFLE_METHODMISSING_ALWAYS_INLINE;
@@ -115,6 +116,7 @@ public class Options {
public final int INTEROP_CONVERT_CACHE = TRUFFLE_INTEROP_CONVERT_CACHE.load();
public final int INTEROP_EXECUTE_CACHE = TRUFFLE_INTEROP_EXECUTE_CACHE.load();
public final int INTEROP_READ_CACHE = TRUFFLE_INTEROP_READ_CACHE.load();
public final int INTEROP_WRITE_CACHE = TRUFFLE_INTEROP_WRITE_CACHE.load();

// Cloning and inlining

4 changes: 2 additions & 2 deletions truffle/src/test/ruby/tck.rb
View file
Original file line number Diff line number Diff line change
@@ -72,8 +72,8 @@ def evaluate_source(mime, source)
# TODO CS-21-Dec-15 java_string_to_ruby shouldn't be needed - we need to convert j.l.String to Ruby's String automatically

Truffle::Interop.eval(
Truffle::Interop.java_string_to_ruby(mime),
Truffle::Interop.java_string_to_ruby(source))
Truffle::Interop.unbox(mime),
Truffle::Interop.unbox(source))
end

Truffle::Interop.export_method(:evaluate_source)