archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 23:04:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

8147615: (fc) FileChannelImpl has no finalizer

Browse source 
Add a cleaner to close parent-less FileChannels

Reviewed-by: alanb, rriggs
This commit is contained in:
Brian Burkhalter 2017-10-10 09:55:14 -07:00
parent 78f24fb8a5
commit b890c3ce83
2 changed files with 101 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java
View file

@ -27,6 +27,7 @@ package sun.nio.ch;
import java.io.FileDescriptor;
import java.io.IOException;
import java.lang.ref.Cleaner.Cleanable;
import java.nio.ByteBuffer;
import java.nio.MappedByteBuffer;
import java.nio.channels.ClosedByInterruptException;
@ -47,6 +48,7 @@ import jdk.internal.misc.JavaIOFileDescriptorAccess;
import jdk.internal.misc.JavaNioAccess;
import jdk.internal.misc.SharedSecrets;
import jdk.internal.ref.Cleaner;
import jdk.internal.ref.CleanerFactory;
import sun.security.action.GetPropertyAction;
public class FileChannelImpl
@ -55,7 +57,7 @@ public class FileChannelImpl
// Memory allocation size for mapping buffers
private static final long allocationGranularity;
// Access to FileDispatcher internals
// Access to FileDescriptor internals
private static final JavaIOFileDescriptorAccess fdAccess =
SharedSecrets.getJavaIOFileDescriptorAccess();
@ -85,6 +87,9 @@ public class FileChannelImpl
// Positional-read is not interruptible
private volatile boolean uninterruptible;
// Cleanable with an action which closes this channel's file descriptor
private final Cleanable closer;
private FileChannelImpl(FileDescriptor fd, String path, boolean readable,
boolean writable, Object parent)
{
@ -94,6 +99,10 @@ public class FileChannelImpl
this.parent = parent;
this.path = path;
this.nd = new FileDispatcherImpl();
// Register a cleaning action if and only if there is no parent
// as the parent will take care of closing the file descriptor.
this.closer= parent != null ? null :
CleanerFactory.cleaner().register(this, () -> fdAccess.close(fd));
}
// Used by FileInputStream.getChannel(), FileOutputStream.getChannel
@ -143,6 +152,10 @@ public class FileChannelImpl
// that method will prevent this method from being reinvoked.
//
((java.io.Closeable)parent).close();
} else if (closer != null) {
// Perform the cleaning action so it is not redone when
// this channel becomes phantom reachable.
closer.clean();
} else {
fdAccess.close(fd);
}
@ -1237,5 +1250,4 @@ public class FileChannelImpl
IOUtil.load();
allocationGranularity = initIDs();
}
}