8022594: Potential deadlock in <clinit> of sun.nio.ch.Util/IOUtil

Reviewed-by: chegar

jdk/src/macosx/classes/sun/nio/ch/KQueueArrayWrapper.java

@@ -87,6 +87,7 @@ class KQueueArrayWrapper {
     private int incomingInterruptFD;
 
     static {
+        IOUtil.load();
         initStructSizes();
         String datamodel = java.security.AccessController.doPrivileged(
             new sun.security.action.GetPropertyAction("sun.arch.data.model")

jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java

@@ -246,9 +246,4 @@ class KQueueSelectorImpl
         }
         return this;
     }
-
-
-    static {
-        Util.load();
-    }
 }

jdk/src/share/classes/sun/nio/ch/AbstractPollSelectorImpl.java

@@ -193,9 +193,4 @@ abstract class AbstractPollSelectorImpl
         if (!selch.isOpen() && !selch.isRegistered())
             ((SelChImpl)selch).kill();
     }
-
-    static {
-        Util.load();
-    }
-
 }

jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java

@@ -1138,7 +1138,7 @@ class DatagramChannelImpl
         throws IOException;
 
     static {
-        Util.load();
+        IOUtil.load();
         initIDs();
     }
 

jdk/src/share/classes/sun/nio/ch/FileChannelImpl.java

@@ -1162,7 +1162,7 @@ public class FileChannelImpl
     private static native long initIDs();
 
     static {
-        Util.load();
+        IOUtil.load();
         allocationGranularity = initIDs();
     }
 

jdk/src/share/classes/sun/nio/ch/IOUtil.java

@@ -347,9 +347,23 @@ public class IOUtil {
 
     static native void initIDs();
 
+    /**
+     * Used to trigger loading of native libraries
+     */
+    public static void load() { }
+
     static {
-        // Note that IOUtil.initIDs is called from within Util.load.
-        Util.load();
+        java.security.AccessController.doPrivileged(
+                new java.security.PrivilegedAction<Void>() {
+                    public Void run() {
+                        System.loadLibrary("net");
+                        System.loadLibrary("nio");
+                        return null;
+                    }
+                });
+
+        initIDs();
+
         IOV_MAX = iovMax();
     }
 

jdk/src/share/classes/sun/nio/ch/Net.java

@@ -582,7 +582,7 @@ public class Net {
     private static native void initIDs();
 
     static {
-        Util.load();
+        IOUtil.load();
         initIDs();
     }
 

jdk/src/share/classes/sun/nio/ch/ServerSocketChannelImpl.java

@@ -416,7 +416,7 @@ class ServerSocketChannelImpl
     private static native void initIDs();
 
     static {
-        Util.load();
+        IOUtil.load();
         initIDs();
         nd = new SocketDispatcher();
     }

jdk/src/share/classes/sun/nio/ch/SocketChannelImpl.java

@@ -1024,7 +1024,7 @@ class SocketChannelImpl
         throws IOException;
 
     static {
-        Util.load();
+        IOUtil.load();
         nd = new SocketDispatcher();
     }
 

jdk/src/share/classes/sun/nio/ch/Util.java

@@ -401,30 +401,4 @@ public class Util {
         return bugLevel.equals(bl);
     }
 
-
-
-    // -- Initialization --
-
-    private static boolean loaded = false;
-
-    public static void load() {
-        synchronized (Util.class) {
-            if (loaded)
-                return;
-            loaded = true;
-            java.security.AccessController.doPrivileged(
-                new java.security.PrivilegedAction<Void>() {
-                    public Void run() {
-                        System.loadLibrary("net");
-                        System.loadLibrary("nio");
-                        return null;
-                    }
-                });
-
-            // IOUtil must be initialized; Its native methods are called from
-            // other places in native nio code so they must be set up.
-            IOUtil.initIDs();
-        }
-    }
-
 }

jdk/src/solaris/classes/sun/nio/ch/DatagramDispatcher.java

@@ -36,7 +36,7 @@ import java.net.*;
 class DatagramDispatcher extends NativeDispatcher
 {
     static {
-        Util.load();
+        IOUtil.load();
     }
 
     int read(FileDescriptor fd, long address, int len) throws IOException {

jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java

@@ -316,4 +316,8 @@ class DevPollArrayWrapper {
     private native int poll0(long pollAddress, int numfds, long timeout,
                              int wfd);
     private static native void interrupt(int fd);
+
+    static {
+        IOUtil.load();
+    }
 }

jdk/src/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java

@@ -196,9 +196,4 @@ class DevPollSelectorImpl
         }
         return this;
     }
-
-    static {
-        Util.load();
-    }
-
 }

jdk/src/solaris/classes/sun/nio/ch/EPoll.java

@@ -113,6 +113,6 @@ class EPoll {
         throws IOException;
 
     static {
-        Util.load();
+        IOUtil.load();
     }
 }

jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java

@@ -318,6 +318,7 @@ class EPollArrayWrapper {
     }
 
     static {
+        IOUtil.load();
         init();
     }
 

jdk/src/solaris/classes/sun/nio/ch/EPollPort.java

@@ -318,6 +318,6 @@ final class EPollPort
     private static native void close0(int fd);
 
     static {
-        Util.load();
+        IOUtil.load();
     }
 }

jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java

@@ -196,8 +196,4 @@ class EPollSelectorImpl
         }
         return this;
     }
-
-    static {
-        Util.load();
-    }
 }

jdk/src/solaris/classes/sun/nio/ch/FileDispatcherImpl.java

@@ -31,7 +31,7 @@ class FileDispatcherImpl extends FileDispatcher
 {
 
     static {
-        Util.load();
+        IOUtil.load();
         init();
     }
 

jdk/src/solaris/classes/sun/nio/ch/InheritedChannel.java

@@ -235,6 +235,6 @@ class InheritedChannel {
     private static native int peerPort0(int fd);
 
     static {
-        Util.load();
+        IOUtil.load();
     }
 }

jdk/src/solaris/classes/sun/nio/ch/KQueue.java

@@ -115,6 +115,6 @@ class KQueue {
         throws IOException;
 
     static {
-        Util.load();
+        IOUtil.load();
     }
 }

jdk/src/solaris/classes/sun/nio/ch/KQueuePort.java

@@ -326,6 +326,6 @@ final class KQueuePort
     private static native void close0(int fd);
 
     static {
-        Util.load();
+        IOUtil.load();
     }
 }

jdk/src/solaris/classes/sun/nio/ch/NativeThread.java

@@ -54,7 +54,7 @@ public class NativeThread {
     private static native void init();
 
     static {
-        Util.load();
+        IOUtil.load();
         init();
     }
 

jdk/src/solaris/classes/sun/nio/ch/PollArrayWrapper.java

@@ -126,4 +126,7 @@ public class PollArrayWrapper extends AbstractPollArrayWrapper {
 
     private static native void interrupt(int fd);
 
+    static {
+        IOUtil.load();
+    }
 }

jdk/src/solaris/classes/sun/nio/ch/SinkChannelImpl.java

@@ -37,7 +37,7 @@ class SinkChannelImpl
 {
 
     // Used to make native read and write calls
-    private static NativeDispatcher nd;
+    private static final NativeDispatcher nd = new FileDispatcherImpl();
 
     // The file descriptor associated with this channel
     FileDescriptor fd;
@@ -206,10 +206,4 @@ class SinkChannelImpl
            throw new IndexOutOfBoundsException();
         return write(Util.subsequence(srcs, offset, length));
     }
-
-    static {
-        Util.load();
-        nd = new FileDispatcherImpl();
-    }
-
 }

jdk/src/solaris/classes/sun/nio/ch/SolarisEventPort.java

@@ -260,6 +260,6 @@ class SolarisEventPort
 
 
     static {
-        Util.load();
+        IOUtil.load();
     }
 }

jdk/src/solaris/classes/sun/nio/ch/SourceChannelImpl.java

@@ -37,7 +37,7 @@ class SourceChannelImpl
 {
 
     // Used to make native read and write calls
-    private static NativeDispatcher nd;
+    private static final NativeDispatcher nd = new FileDispatcherImpl();
 
     // The file descriptor associated with this channel
     FileDescriptor fd;
@@ -206,10 +206,4 @@ class SourceChannelImpl
             }
         }
     }
-
-    static {
-        Util.load();
-        nd = new FileDispatcherImpl();
-    }
-
 }

jdk/src/solaris/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java

@@ -345,7 +345,7 @@ class UnixAsynchronousServerSocketChannelImpl
         throws IOException;
 
     static {
-        Util.load();
+        IOUtil.load();
         initIDs();
     }
 }

jdk/src/solaris/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java

@@ -748,6 +748,6 @@ class UnixAsynchronousSocketChannelImpl
     private static native void checkConnect(int fdVal) throws IOException;
 
     static {
-        Util.load();
+        IOUtil.load();
     }
 }

jdk/src/solaris/classes/sun/nio/ch/sctp/SctpChannelImpl.java

@@ -1106,7 +1106,7 @@ public class SctpChannelImpl extends SctpChannel
             boolean ready) throws IOException;
 
     static {
-        Util.load();   /* loads nio & net native libraries */
+        IOUtil.load();   /* loads nio & net native libraries */
         java.security.AccessController.doPrivileged(
             new java.security.PrivilegedAction<Void>() {
                 public Void run() {

jdk/src/solaris/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java

@@ -995,7 +995,7 @@ public class SctpMultiChannelImpl extends SctpMultiChannel
     }
 
     static {
-        Util.load();   /* loads nio & net native libraries */
+        IOUtil.load();   /* loads nio & net native libraries */
         java.security.AccessController.doPrivileged(
             new java.security.PrivilegedAction<Void>() {
                 public Void run() {

jdk/src/solaris/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java

@@ -426,7 +426,7 @@ public class SctpServerChannelImpl extends SctpServerChannel
         FileDescriptor newfd, InetSocketAddress[] isaa) throws IOException;
 
     static {
-        Util.load();   // loads nio & net native libraries
+        IOUtil.load();   // loads nio & net native libraries
         java.security.AccessController.doPrivileged(
             new java.security.PrivilegedAction<Void>() {
                 public Void run() {

jdk/src/windows/classes/sun/nio/ch/DatagramDispatcher.java

@@ -36,7 +36,7 @@ import java.net.*;
 class DatagramDispatcher extends NativeDispatcher
 {
     static {
-        Util.load();
+        IOUtil.load();
     }
 
     int read(FileDescriptor fd, long address, int len) throws IOException {

jdk/src/windows/classes/sun/nio/ch/FileDispatcherImpl.java

@@ -32,7 +32,7 @@ import sun.misc.JavaIOFileDescriptorAccess;
 class FileDispatcherImpl extends FileDispatcher
 {
     static {
-        Util.load();
+        IOUtil.load();
     }
 
     /**

jdk/src/windows/classes/sun/nio/ch/FileKey.java

@@ -73,6 +73,7 @@ public class FileKey {
     private static native void initIDs();
 
     static {
+        IOUtil.load();
         initIDs();
     }
 }

jdk/src/windows/classes/sun/nio/ch/Iocp.java

@@ -443,7 +443,7 @@ class Iocp extends AsynchronousChannelGroupImpl {
     private static native String getErrorMessage(int error);
 
     static {
-        Util.load();
+        IOUtil.load();
         initIDs();
 
         // thread agnostic I/O on Vista/2008 or newer

jdk/src/windows/classes/sun/nio/ch/PipeImpl.java

@@ -56,7 +56,6 @@ class PipeImpl
     private static final Random rnd;
 
     static {
-        Util.load();
         byte[] someBytes = new byte[8];
         boolean resultOK = IOUtil.randomBytes(someBytes);
         if (resultOK) {

jdk/src/windows/classes/sun/nio/ch/SocketDispatcher.java

@@ -36,7 +36,7 @@ class SocketDispatcher extends NativeDispatcher
 {
 
     static {
-        Util.load();
+        IOUtil.load();
     }
 
     int read(FileDescriptor fd, long address, int len) throws IOException {

jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java

@@ -750,6 +750,6 @@ public class WindowsAsynchronousFileChannelImpl
     private static native void close0(long handle);
 
     static {
-        Util.load();
+        IOUtil.load();
     }
 }

jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java

@@ -363,7 +363,7 @@ class WindowsAsynchronousServerSocketChannelImpl
     private static native void closesocket0(long socket) throws IOException;
 
     static {
-        Util.load();
+        IOUtil.load();
         initIDs();
     }
 }

jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java

@@ -919,7 +919,7 @@ class WindowsAsynchronousSocketChannelImpl
     private static native void closesocket0(long socket) throws IOException;
 
     static {
-        Util.load();
+        IOUtil.load();
         initIDs();
     }
 }

jdk/src/windows/classes/sun/nio/ch/WindowsSelectorImpl.java

@@ -611,6 +611,6 @@ final class WindowsSelectorImpl extends SelectorImpl {
     }
 
     static {
-        Util.load();
+        IOUtil.load();
     }
 }