[Truffle] Put getgroups into TrufflePosix, but still use the JDK impl…

…ementation for now.
jruby · Oct 9, 2016 · fc52ea4 · fc52ea4
1 parent 8f3c006
commit fc52ea4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/extra/TrufflePosixNodes.java b/truffle/src/main/java/org/jruby/truffle/extra/TrufflePosixNodes.java
@@ -20,7 +20,6 @@
 import jnr.constants.platform.Fcntl;
 import jnr.ffi.Pointer;
 import org.jcodings.specific.UTF8Encoding;
-import org.jruby.platform.Platform;
 import org.jruby.truffle.Layouts;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.builtins.CoreClass;
@@ -191,13 +190,13 @@ public abstract static class GetGroupsNode extends CoreMethodArrayArgumentsNode
 
         @Specialization(guards = "isNil(pointer)")
         public int getGroupsNil(int max, DynamicObject pointer) {
-            return Platform.getPlatform().getGroups(null).length;
+            return getContext().getNativePlatform().getPosix().getgroups().length;
         }
 
         @CompilerDirectives.TruffleBoundary
         @Specialization(guards = "isRubyPointer(pointer)")
         public int getGroups(int max, DynamicObject pointer) {
-            final long[] groups = Platform.getPlatform().getGroups(null);
+            final long[] groups = getContext().getNativePlatform().getPosix().getgroups();
 
             final Pointer pointerValue = Layouts.POINTER.getPointer(pointer);
 

diff --git a/truffle/src/main/java/org/jruby/truffle/platform/posix/JNRTrufflePosix.java b/truffle/src/main/java/org/jruby/truffle/platform/posix/JNRTrufflePosix.java
@@ -19,6 +19,7 @@
 import jnr.posix.SignalHandler;
 import jnr.posix.SpawnFileAction;
 import jnr.posix.Times;
+import org.jruby.platform.Platform;
 import org.jruby.truffle.core.CoreLibrary;
 
 import java.io.FileDescriptor;
@@ -434,4 +435,9 @@ public int isatty(int fd) {
     public int mkfifo(String path, int mode) {
         return posix.mkfifo(path, mode);
     }
+
+    @Override
+    public long[] getgroups() {
+        return Platform.getPlatform().getGroups(null);
+    }
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/platform/posix/TrufflePosix.java b/truffle/src/main/java/org/jruby/truffle/platform/posix/TrufflePosix.java
@@ -103,5 +103,6 @@ public interface TrufflePosix {
     int fsync(int fd);
     int isatty(int fd);
     int mkfifo(String path, int mode);
+    long[] getgroups();
 
 }