Reorder close cleanup before thread wakeups.

Fixes a race in test_io.rb:test_race_closed_stream from MRI. See https://bugs.ruby-lang.org/issues/13158
jruby · Mar 15, 2018 · 9cd2bae · 9cd2bae
1 parent 8f7385d
commit 9cd2bae
Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/core/src/main/java/org/jruby/RubyIO.java b/core/src/main/java/org/jruby/RubyIO.java
@@ -2049,6 +2049,8 @@ protected IRubyObject rbIoClose(Ruby runtime) {
             if (fptr == null) return runtime.getNil();
             if (fptr.fd() == null) return runtime.getNil();
 
+            fptr.finalizeFlush(context, false);
+
             // interrupt waiting threads
             fptr.interruptBlockingThreads(context);
             try {
@@ -2057,6 +2059,7 @@ protected IRubyObject rbIoClose(Ruby runtime) {
             } finally {
                 fptr.lock();
             }
+
             fptr.cleanup(runtime, false);
 
             if (fptr.getProcess() != null) {

diff --git a/core/src/main/java/org/jruby/util/io/OpenFile.java b/core/src/main/java/org/jruby/util/io/OpenFile.java
@@ -838,6 +838,10 @@ public void finalize() {
     }
 
     public void finalize(ThreadContext context, boolean noraise) {
+        finalizeFlush(context, noraise);
+    }
+
+    public void finalizeFlush(ThreadContext context, boolean noraise) {
         IRubyObject err = runtime.getNil();
         ChannelFD fd = this.fd();
         Closeable stdio_file = this.stdio_file;