[Truffle] Simplify POSIX#getgroups.

jruby · Dec 15, 2016 · 1717c08 · nirvdrum · Dec 16, 2016 · eregon
1 parent e750435
commit 1717c08
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 23 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
@@ -182,24 +182,13 @@ public int getGID() {
 
     }
 
-    @CoreMethod(names = "getgroups", isModuleFunction = true, required = 2, lowerFixnum = 1, unsafe = {UnsafeGroup.MEMORY, UnsafeGroup.PROCESSES})
+    @CoreMethod(names = "getgroups", isModuleFunction = true, unsafe = {UnsafeGroup.MEMORY, UnsafeGroup.PROCESSES})
     public abstract static class GetGroupsNode extends CoreMethodArrayArgumentsNode {
 
-        @TruffleBoundary
-        @Specialization(guards = "isNil(pointer)")
-        public int getGroupsNil(int max, DynamicObject pointer) {
-            return getGroups().length;
-        }
-
-        @TruffleBoundary
-        @Specialization(guards = "isRubyPointer(pointer)")
-        public int getGroups(int max, DynamicObject pointer) {
-            final Pointer pointerValue = Layouts.POINTER.getPointer(pointer);
+        @Specialization
+        public DynamicObject getgroups() {
             final long[] groups = getGroups();
-            for (int n = 0; n < groups.length; n++) {
-                pointerValue.putInt(4 * n, (int) groups[n]);
-            }
-            return groups.length;
+            return createArray(groups, groups.length);
         }
 
         @TruffleBoundary

diff --git a/truffle/src/main/ruby/core/process.rb b/truffle/src/main/ruby/core/process.rb
@@ -431,14 +431,7 @@ def self.setpriority(kind, id, priority)
   end
 
   def self.groups
-    g = []
-    count = Truffle::POSIX.getgroups(0, nil)
-    FFI::MemoryPointer.new(:int, count) do |p|
-      num_groups = Truffle::POSIX.getgroups(count, p)
-      Errno.handle if num_groups == -1
-      g = p.read_array_of_int(num_groups)
-    end
-    g
+    Truffle::POSIX.getgroups
   end
 
   def self.groups=(g)