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

Commits on Mar 7, 2016

  1. Copy the full SHA
    3321341 View commit details
  2. Copy the full SHA
    5871e26 View commit details
  3. Copy the full SHA
    68b92b2 View commit details
  4. Copy the full SHA
    7b538cf View commit details
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@
package org.jruby.truffle.core.array;

import com.oracle.truffle.api.CompilerAsserts;

import java.lang.reflect.Array;
import java.util.Arrays;

Original file line number Diff line number Diff line change
@@ -14,8 +14,6 @@
import org.jcodings.specific.USASCIIEncoding;
import org.jcodings.specific.UTF8Encoding;

import static org.jruby.truffle.core.rope.CodeRange.CR_7BIT;

public class RopeConstants {

public static final LeafRope EMPTY_ASCII_8BIT_ROPE;
Original file line number Diff line number Diff line change
@@ -14,7 +14,6 @@
import com.oracle.truffle.api.Truffle;
import com.oracle.truffle.api.frame.FrameInstance;
import com.oracle.truffle.api.frame.FrameInstanceVisitor;
import com.oracle.truffle.api.frame.MaterializedFrame;
import com.oracle.truffle.api.nodes.Node;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
Original file line number Diff line number Diff line change
@@ -18,7 +18,6 @@
import org.jruby.truffle.core.Layouts;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.language.RubyRootNode;
import org.jruby.truffle.language.arguments.RubyArguments;
import org.jruby.truffle.language.control.RaiseException;
import org.jruby.truffle.language.loader.SourceLoader;

Original file line number Diff line number Diff line change
@@ -24,9 +24,9 @@
import org.jruby.truffle.language.control.RaiseException;
import org.jruby.truffle.language.methods.DeclarationContext;
import org.jruby.truffle.language.parser.ParserContext;

import java.io.File;
import java.io.IOException;
import java.util.Arrays;

public class FeatureLoader {

Original file line number Diff line number Diff line change
@@ -24,10 +24,10 @@
import org.jruby.truffle.platform.openjdk.OpenJDKArrayBlockingQueueLocksConditions;
import org.jruby.truffle.platform.openjdk.OpenJDKLinkedBlockingQueueLocksConditions;
import org.jruby.truffle.platform.posix.ClockGetTime;
import org.jruby.truffle.platform.posix.JNRPosix;
import org.jruby.truffle.platform.posix.JNRTrufflePosix;
import org.jruby.truffle.platform.posix.Sockets;
import org.jruby.truffle.platform.posix.TrufflePosixHandler;
import org.jruby.truffle.platform.posix.TrufflePosix;
import org.jruby.truffle.platform.posix.TrufflePosixHandler;
import org.jruby.truffle.platform.signal.SignalManager;
import org.jruby.truffle.platform.sunmisc.SunMiscSignalManager;

@@ -42,7 +42,7 @@ public class DarwinPlatform implements NativePlatform {
private final RubiniusConfiguration rubiniusConfiguration;

public DarwinPlatform(RubyContext context) {
posix = new JNRPosix(POSIXFactory.getNativePOSIX(new TrufflePosixHandler(context)));
posix = new JNRTrufflePosix(POSIXFactory.getNativePOSIX(new TrufflePosixHandler(context)));
memoryManager = Runtime.getSystemRuntime().getMemoryManager();
signalManager = new SunMiscSignalManager();
processName = new DarwinProcessName();
578 changes: 0 additions & 578 deletions truffle/src/main/java/org/jruby/truffle/platform/java/BaseLibC.java

This file was deleted.

Original file line number Diff line number Diff line change
@@ -23,8 +23,8 @@
import org.jruby.truffle.platform.openjdk.OpenJDKLinkedBlockingQueueLocksConditions;
import org.jruby.truffle.platform.posix.ClockGetTime;
import org.jruby.truffle.platform.posix.Sockets;
import org.jruby.truffle.platform.posix.TrufflePosixHandler;
import org.jruby.truffle.platform.posix.TrufflePosix;
import org.jruby.truffle.platform.posix.TrufflePosixHandler;
import org.jruby.truffle.platform.signal.SignalManager;
import org.jruby.truffle.platform.sunmisc.SunMiscSignalManager;

@@ -39,7 +39,7 @@ public class JavaPlatform implements NativePlatform {
private final RubiniusConfiguration rubiniusConfiguration;

public JavaPlatform(RubyContext context) {
posix = new TruffleJavaPosix(POSIXFactory.getJavaPOSIX(new TrufflePosixHandler(context)));
posix = new JavaTrufflePosix(POSIXFactory.getJavaPOSIX(new TrufflePosixHandler(context)));
memoryManager = new JavaMemoryManager();
signalManager = new SunMiscSignalManager();
processName = new JavaProcessName();
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
import jnr.constants.platform.OpenFlags;
import jnr.posix.FileStat;
import jnr.posix.POSIX;
import org.jruby.truffle.platform.posix.JNRPosix;
import org.jruby.truffle.platform.posix.JNRTrufflePosix;

import java.io.FileNotFoundException;
import java.io.IOException;
@@ -25,7 +25,7 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;

public class TruffleJavaPosix extends JNRPosix {
public class JavaTrufflePosix extends JNRTrufflePosix {

private static class OpenFile {

@@ -53,7 +53,7 @@ public int getFlags() {
private final AtomicInteger nextFileHandle = new AtomicInteger(3);
private final Map<Integer, OpenFile> fileHandles = new ConcurrentHashMap<>();

public TruffleJavaPosix(POSIX delegateTo) {
public JavaTrufflePosix(POSIX delegateTo) {
super(delegateTo);
}

Original file line number Diff line number Diff line change
@@ -24,10 +24,10 @@
import org.jruby.truffle.platform.openjdk.OpenJDKArrayBlockingQueueLocksConditions;
import org.jruby.truffle.platform.openjdk.OpenJDKLinkedBlockingQueueLocksConditions;
import org.jruby.truffle.platform.posix.ClockGetTime;
import org.jruby.truffle.platform.posix.JNRPosix;
import org.jruby.truffle.platform.posix.JNRTrufflePosix;
import org.jruby.truffle.platform.posix.Sockets;
import org.jruby.truffle.platform.posix.TrufflePosixHandler;
import org.jruby.truffle.platform.posix.TrufflePosix;
import org.jruby.truffle.platform.posix.TrufflePosixHandler;
import org.jruby.truffle.platform.signal.SignalManager;
import org.jruby.truffle.platform.sunmisc.SunMiscSignalManager;

@@ -42,7 +42,7 @@ public class LinuxPlatform implements NativePlatform {
private final RubiniusConfiguration rubiniusConfiguration;

public LinuxPlatform(RubyContext context) {
posix = new JNRPosix(POSIXFactory.getNativePOSIX(new TrufflePosixHandler(context)));
posix = new JNRTrufflePosix(POSIXFactory.getNativePOSIX(new TrufflePosixHandler(context)));
memoryManager = Runtime.getSystemRuntime().getMemoryManager();
signalManager = new SunMiscSignalManager();
processName = new JavaProcessName();
Original file line number Diff line number Diff line change
@@ -24,11 +24,11 @@
import java.nio.ByteBuffer;
import java.util.Collection;

public class JNRPosix implements TrufflePosix {
public class JNRTrufflePosix implements TrufflePosix {

private final POSIX posix;

public JNRPosix(POSIX posix) {
public JNRTrufflePosix(POSIX posix) {
this.posix = posix;
}

@@ -405,11 +405,6 @@ public String getcwd() {
return posix.getcwd();
}

@Override
public int fcntl(int fd, Fcntl fcntlConst, int... arg) {
return posix.fcntl(fd, fcntlConst, arg);
}

@Override
public int fsync(int fd) {
return posix.fsync(fd);
Original file line number Diff line number Diff line change
@@ -98,7 +98,6 @@ public interface TrufflePosix {
int ftruncate(int fd, long offset);
int rename(CharSequence oldName, CharSequence newName);
String getcwd();
int fcntl(int fd, Fcntl fcntlConst, int... arg);
int fsync(int fd);
int isatty(int fd);