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

Commits on Dec 22, 2015

  1. NonBlockingHashMapLong copy-pasted from org.cliffc.high_scale_lib pac… 

    …kage
    @kares
    kares committed Dec 22, 2015
    Copy the full SHA
    f1bf590 View commit details

  2. NonBlockingHashMapLong - add in required Counter class and comment ou… 

    …t prints
    @kares
    kares committed Dec 22, 2015
    Copy the full SHA
    da012ad View commit details

  3. add (and re-arrange) AbstractEntry class - NonBlockingHashMapLong now… 

    … compilable
    @kares
    kares committed Dec 22, 2015
    Copy the full SHA
    d08a1a6 View commit details

  4. make Unsafe usage in NonBlockingHashMapLong (ported from high-scale l… 

    …ib) optional
    @kares
    kares committed Dec 22, 2015
    Copy the full SHA
    1624fd4 View commit details

  5. use the (internal) backported NonBlockingHashMapLong class instead of… 

    … high_scale's

this is to support envs that do not have sun.misc.Unsafe (such as Android)
    @kares
    kares committed Dec 22, 2015
    Copy the full SHA
    bad6805 View commit details

  6. AtomicReferenceFieldUpdater forces us to have volatile fields 

    ... hopefully this won't have much effect on map's performance
    @kares
    kares committed Dec 22, 2015
    Copy the full SHA
    d24c148 View commit details

  7. remove com.bounday:high-scale-lib dependency (extracted necessary cla… 

    …sses from it)
    @kares
    kares committed Dec 22, 2015
    Copy the full SHA
    ec05575 View commit details
5 changes: 0 additions & 5 deletions core/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -207,11 +207,6 @@
<artifactId>options</artifactId>
<version>1.3</version>
</dependency>
<dependency>
<groupId>com.boundary</groupId>
<artifactId>high-scale-lib</artifactId>
<version>1.0.6</version>
</dependency>
</dependencies>
<properties>
<anno.sources>${project.basedir}/target/generated-sources</anno.sources>
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/java/invokers/RubyToJavaInvoker.java
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,6 @@
import java.lang.reflect.Modifier;
import java.util.ArrayList;

import org.cliffc.high_scale_lib.NonBlockingHashMapLong;
import org.jruby.Ruby;
import org.jruby.RubyModule;
import org.jruby.exceptions.RaiseException;
@@ -24,6 +23,7 @@
import org.jruby.runtime.Visibility;
import org.jruby.runtime.builtin.IRubyObject;
import org.jruby.util.collections.IntHashMap;
import org.jruby.util.collections.NonBlockingHashMapLong;

import static org.jruby.util.CodegenUtils.prettyParams;

2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/javasupport/Java.java
View file
Original file line number Diff line number Diff line change
@@ -49,7 +49,6 @@
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import org.cliffc.high_scale_lib.NonBlockingHashMapLong;

import org.jcodings.Encoding;

@@ -104,6 +103,7 @@
import org.jruby.util.SafePropertyAccessor;
import org.jruby.util.cli.Options;
import org.jruby.util.collections.IntHashMap;
import org.jruby.util.collections.NonBlockingHashMapLong;

import static org.jruby.java.dispatch.CallableSelector.newCallableCache;
import org.jruby.java.invokers.RubyToJavaInvoker;
Loading