jruby · Apr 11, 2016 · Apr 11, 2016 · Apr 11, 2016 · Apr 11, 2016 · Apr 11, 2016
Showing with 24 additions and 28 deletions.

+0 −3 spec/truffle/tags/core/io/reopen_tags.txt

+1 −1 tool/jt.rb

+23 −24 truffle/src/main/java/org/jruby/truffle/core/rubinius/IOPrimitiveNodes.java
diff --git a/spec/truffle/tags/core/io/reopen_tags.txt b/spec/truffle/tags/core/io/reopen_tags.txt
@@ -1,6 +1,3 @@
 fails:IO#reopen with a String effects exec/system/fork performed after it
 fails:IO#reopen with a String opens a path after writing to the original file descriptor
-fails:IO#reopen with an IO reads from the beginning if the other IO has not been read from
-fails:IO#reopen with an IO reads from the current position of the other IO's stream
-fails:IO#reopen with an IO associates the IO instance with the other IO's stream
 slow:IO#reopen with a String effects exec/system/fork performed after it
diff --git a/tool/jt.rb b/tool/jt.rb
@@ -410,7 +410,7 @@ def test(*args)
       test_tck
       test_specs('run')
       # test_mri # TODO (pitr-ch 29-Mar-2016): temporarily disabled
-      test_integration({'CI' => true, 'HAS_REDIS' => true}, 'all')
+      test_integration({'CI' => 'true', 'HAS_REDIS' => 'true'}, 'all')
       test_compiler
     when 'compiler' then test_compiler(*rest)
     when 'integration' then test_integration({}, *rest)

diff --git a/truffle/src/main/java/org/jruby/truffle/core/rubinius/IOPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/core/rubinius/IOPrimitiveNodes.java
@@ -163,7 +163,6 @@ public int open(DynamicObject path, int mode, int permission) {
 
     }
 
-
     @RubiniusPrimitive(name = "io_truncate", needsSelf = false, unsafe = UnsafeGroup.IO)
     public static abstract class IOTruncatePrimitiveNode extends RubiniusPrimitiveArrayArgumentsNode {
 
@@ -206,7 +205,7 @@ public IOFNMatchPrimitiveNode(RubyContext context, SourceSection sourceSection)
         }
 
         @TruffleBoundary
-        @Specialization(guards = {"isRubyString(pattern)", "isRubyString(path)"})
+        @Specialization(guards = { "isRubyString(pattern)", "isRubyString(path)" })
         public boolean fnmatch(DynamicObject pattern, DynamicObject path, int flags) {
             final Rope patternRope = rope(pattern);
             final Rope pathRope = rope(path);
@@ -235,10 +234,10 @@ public DynamicObject ensureOpen(VirtualFrame frame, DynamicObject file) {
             final int fd = Layouts.IO.getDescriptor(file);
             if (fd == -1) {
                 CompilerDirectives.transferToInterpreter();
-                throw new RaiseException(coreLibrary().ioError("closed stream",this));
+                throw new RaiseException(coreLibrary().ioError("closed stream", this));
             } else if (fd == -2) {
                 CompilerDirectives.transferToInterpreter();
-                throw new RaiseException(coreLibrary().ioError("shutdown stream",this));
+                throw new RaiseException(coreLibrary().ioError("shutdown stream", this));
             }
             return nil();
         }
@@ -267,7 +266,7 @@ public Object readIfAvailable(DynamicObject file, int numberOfBytes) {
             fdSet.set(fd);
 
             final Timeval timeoutObject = new DefaultNativeTimeval(jnr.ffi.Runtime.getSystemRuntime());
-            timeoutObject.setTime(new long[] { 0, 0 });
+            timeoutObject.setTime(new long[]{ 0, 0 });
 
             final int res = nativeSockets().select(fd + 1, fdSet.getPointer(),
                     PointerPrimitiveNodes.NULL_POINTER, PointerPrimitiveNodes.NULL_POINTER, timeoutObject);
@@ -306,22 +305,22 @@ public IOReopenPrimitiveNode(RubyContext context, SourceSection sourceSection) {
         }
 
         @TruffleBoundary
-        private void performReopen(DynamicObject file, DynamicObject io) {
-            final int fd = Layouts.IO.getDescriptor(file);
-            final int fdOther = Layouts.IO.getDescriptor(io);
+        private void performReopen(DynamicObject self, DynamicObject target) {
+            final int fdSelf = Layouts.IO.getDescriptor(self);
+            final int fdTarget = Layouts.IO.getDescriptor(target);
 
-            final int result = posix().dup2(fd, fdOther);
-            if (result == -1) {
-                CompilerDirectives.transferToInterpreter();
-                throw new RaiseException(coreLibrary().errnoError(posix().errno(), this));
-            }
+            ensureSuccessful(posix().dup2(fdTarget, fdSelf));
 
-            final int mode = posix().fcntl(fd, Fcntl.F_GETFL);
-            if (mode < 0) {
+            final int newSelfMode = ensureSuccessful(posix().fcntl(fdSelf, Fcntl.F_GETFL));
+            Layouts.IO.setMode(self, newSelfMode);
+        }
+
+        private int ensureSuccessful(int result) {
+            if (result < 0) {
                 CompilerDirectives.transferToInterpreter();
                 throw new RaiseException(coreLibrary().errnoError(posix().errno(), this));
             }
-            Layouts.IO.setMode(file, mode);
+            return result;
         }
 
         @Specialization
@@ -477,7 +476,7 @@ public int close(VirtualFrame frame, DynamicObject io) {
 
     }
 
-    @RubiniusPrimitive(name = "io_seek", lowerFixnumParameters = {0, 1}, unsafe = UnsafeGroup.IO)
+    @RubiniusPrimitive(name = "io_seek", lowerFixnumParameters = { 0, 1 }, unsafe = UnsafeGroup.IO)
     public static abstract class IOSeekPrimitiveNode extends RubiniusPrimitiveArrayArgumentsNode {
 
         public IOSeekPrimitiveNode(RubyContext context, SourceSection sourceSection) {
@@ -505,7 +504,7 @@ public AcceptNode(RubyContext context, SourceSection sourceSection) {
         public int accept(DynamicObject io) {
             final int fd = Layouts.IO.getDescriptor(io);
 
-            final int[] addressLength = {16};
+            final int[] addressLength = { 16 };
             final long address = UnsafeHolder.U.allocateMemory(addressLength[0]);
 
             final int newFd;
@@ -584,7 +583,7 @@ public Object select(DynamicObject readables, DynamicObject writables, DynamicOb
         }
 
         @TruffleBoundary
-        @Specialization(guards = {"isRubyArray(readables)", "isNil(writables)", "isNil(errorables)"})
+        @Specialization(guards = { "isRubyArray(readables)", "isNil(writables)", "isNil(errorables)" })
         public Object select(DynamicObject readables, DynamicObject writables, DynamicObject errorables, int timeoutMicros) {
             final Object[] readableObjects = ArrayOperations.toObjectArray(readables);
             final int[] readableFds = getFileDescriptors(readables);
@@ -631,10 +630,10 @@ private int callSelect(int nfds, FDSet readableSet, Timeval timeoutToUse) {
                 return nil();
             }
 
-            return Layouts.ARRAY.createArray(coreLibrary().getArrayFactory(), new Object[] {
-                    getSetObjects(readableObjects, readableFds, readableSet),
-                    Layouts.ARRAY.createArray(coreLibrary().getArrayFactory(), null, 0),
-                    Layouts.ARRAY.createArray(coreLibrary().getArrayFactory(), null, 0) },
+            return Layouts.ARRAY.createArray(coreLibrary().getArrayFactory(), new Object[]{
+                            getSetObjects(readableObjects, readableFds, readableSet),
+                            Layouts.ARRAY.createArray(coreLibrary().getArrayFactory(), null, 0),
+                            Layouts.ARRAY.createArray(coreLibrary().getArrayFactory(), null, 0) },
                     3);
         }
 
@@ -678,7 +677,7 @@ private int callSelect(int nfds, FDSet writableSet) {
             return Layouts.ARRAY.createArray(coreLibrary().getArrayFactory(), new Object[]{
                             Layouts.ARRAY.createArray(coreLibrary().getArrayFactory(), null, 0),
                             getSetObjects(writableObjects, writableFds, writableSet),
-                            Layouts.ARRAY.createArray(coreLibrary().getArrayFactory(), null, 0)},
+                            Layouts.ARRAY.createArray(coreLibrary().getArrayFactory(), null, 0) },
                     3);
         }