8337143: (fc, fs) Move filesystem-related native objects from libnio to libjava

make/modules/java.base/Lib.gmk

@@ -75,6 +75,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBNIO, \
     NAME := nio, \
     OPTIMIZATION := HIGH, \
     EXTRA_HEADER_DIRS := \
+        libjava/nio/ch \
         libnio/ch \
         libnio/fs \
         libjvm, \
@@ -86,7 +87,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBNIO, \
     LIBS_macosx := \
         -framework CoreFoundation \
         -framework CoreServices, \
-    LIBS_windows := advapi32.lib mswsock.lib ws2_32.lib, \
+    LIBS_windows := advapi32.lib ws2_32.lib, \
 ))
 
 TARGETS += $(BUILD_LIBNIO)

make/modules/java.base/lib/CoreLibraries.gmk

@@ -55,20 +55,23 @@ endif
 $(eval $(call SetupJdkLibrary, BUILD_LIBJAVA, \
     NAME := java, \
     OPTIMIZATION := HIGH, \
+    EXTRA_HEADER_DIRS := \
+        libjava/nio/ch, \
     jdk_util.c_CFLAGS := $(VERSION_CFLAGS), \
     ProcessImpl_md.c_CFLAGS := $(VERSION_CFLAGS), \
     java_props_md.c_CFLAGS := \
         -DARCHPROPNAME='"$(OPENJDK_TARGET_CPU_OSARCH)"', \
     DISABLED_WARNINGS_gcc_ProcessImpl_md.c := unused-result, \
     DISABLED_WARNINGS_clang_TimeZone_md.c := unused-variable, \
     JDK_LIBS := libjvm, \
-    LIBS_linux := $(LIBDL), \
+    LIBS_linux := $(LIBDL) -lpthread, \
     LIBS_aix := $(LIBDL) $(LIBM), \
     LIBS_macosx := \
         -framework CoreFoundation \
+        -framework CoreServices \
         -framework Foundation \
         -framework SystemConfiguration, \
-    LIBS_windows := advapi32.lib ole32.lib shell32.lib version.lib, \
+    LIBS_windows := advapi32.lib mswsock.lib ole32.lib shell32.lib version.lib ws2_32.lib, \
 ))
 
 TARGETS += $(BUILD_LIBJAVA)

make/modules/jdk.sctp/Lib.gmk

@@ -38,8 +38,8 @@ ifeq ($(call isTargetOs, linux), true)
       EXTRA_HEADER_DIRS := \
           $(call GetJavaHeaderDir, java.base) \
           java.base:libjvm \
-          java.base:libnio \
-          java.base:libnio/ch, \
+          java.base:libjava/nio \
+          java.base:libjava/nio/ch, \
       JDK_LIBS := java.base:libjava java.base:libnet, \
       LIBS_linux := $(LIBDL), \
   ))

src/java.base/linux/classes/sun/nio/ch/EPoll.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,7 +51,7 @@ private EPoll() { }
      * }
      */
     static {
-        IOUtil.load();
+        NIOUtil.load();
     }
     private static final int SIZEOF_EPOLLEVENT   = eventSize();
     private static final int OFFSETOF_EVENTS     = eventsOffset();

src/java.base/linux/classes/sun/nio/ch/EPollPort.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -95,7 +95,7 @@ static class Event {
 
         // create socket pair for wakeup mechanism
         try {
-            long fds = IOUtil.makePipe(true);
+            long fds = NIOUtil.makePipe(true);
             this.sp = new int[]{(int) (fds >>> 32), (int) fds};
         } catch (IOException ioe) {
             EPoll.freePollArray(address);
@@ -136,7 +136,7 @@ private void wakeup() {
         if (wakeupCount.incrementAndGet() == 1) {
             // write byte to socketpair to force wakeup
             try {
-                IOUtil.write1(sp[1], (byte)0);
+                NIOUtil.write1(sp[1], (byte)0);
             } catch (IOException x) {
                 throw new AssertionError(x);
             }
@@ -219,7 +219,7 @@ private Event poll() throws IOException {
                                     // a wakeup byte queued to wake each thread
                                     int nread;
                                     do {
-                                        nread = IOUtil.drain1(sp[0]);
+                                        nread = NIOUtil.drain1(sp[0]);
                                     } while (nread == IOStatus.INTERRUPTED);
                                 }
 

src/java.base/linux/classes/sun/nio/ch/EPollSelectorImpl.java

@@ -49,7 +49,7 @@
 class EPollSelectorImpl extends SelectorImpl {
 
     // maximum number of events to poll in one call to epoll_wait
-    private static final int NUM_EPOLLEVENTS = Math.min(IOUtil.fdLimit(), 1024);
+    private static final int NUM_EPOLLEVENTS = Math.min(NIOUtil.fdLimit(), 1024);
 
     // epoll file descriptor
     private final int epfd;
@@ -79,7 +79,7 @@ class EPollSelectorImpl extends SelectorImpl {
 
         try {
             this.eventfd = new EventFD();
-            IOUtil.configureBlocking(IOUtil.newFD(eventfd.efd()), false);
+            NIOUtil.configureBlocking(NIOUtil.newFD(eventfd.efd()), false);
         } catch (IOException ioe) {
             EPoll.freePollArray(pollArrayAddress);
             FileDispatcherImpl.closeIntFD(epfd);

src/java.base/linux/classes/sun/nio/ch/EventFD.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,7 +49,7 @@ void set() throws IOException {
     }
 
     void reset() throws IOException {
-        IOUtil.drain(efd);
+        NIOUtil.drain(efd);
     }
 
     void close() throws IOException {
@@ -68,6 +68,6 @@ void close() throws IOException {
     private static native int set0(int efd) throws IOException;
 
     static {
-        IOUtil.load();
+        NIOUtil.load();
     }
 }

src/java.base/linux/classes/sun/nio/ch/FileDispatcherImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,7 +58,6 @@ static native long transferFrom0(FileDescriptor src, FileDescriptor dst,
     static native void init0();
 
     static {
-        IOUtil.load();
         init0();
     }
 }

src/java.base/linux/classes/sun/nio/fs/LinuxNativeDispatcher.java

@@ -90,7 +90,6 @@ static native int directCopy0(int dst, int src, long addressToPollForCancel)
     private static native void init();
 
     static {
-        jdk.internal.loader.BootLoader.loadLibrary("nio");
         init();
     }
 }

src/java.base/macosx/classes/sun/nio/ch/KQueue.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,7 @@ private KQueue() { }
      * };
      */
     static {
-        IOUtil.load();
+        NIOUtil.load();
     }
     private static final int SIZEOF_KQUEUEEVENT    = keventSize();
     private static final int OFFSET_IDENT          = identOffset();

src/java.base/macosx/classes/sun/nio/ch/KQueuePort.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -91,7 +91,7 @@ static class Event {
 
         // create socket pair for wakeup mechanism
         try {
-            long fds = IOUtil.makePipe(true);
+            long fds = NIOUtil.makePipe(true);
             this.sp = new int[]{(int) (fds >>> 32), (int) fds};
         } catch (IOException ioe) {
             KQueue.freePollArray(address);
@@ -133,7 +133,7 @@ private void wakeup() {
         if (wakeupCount.incrementAndGet() == 1) {
             // write byte to socketpair to force wakeup
             try {
-                IOUtil.write1(sp[1], (byte)0);
+                NIOUtil.write1(sp[1], (byte)0);
             } catch (IOException x) {
                 throw new AssertionError(x);
             }
@@ -220,7 +220,7 @@ private Event poll() throws IOException {
                                     // a wakeup byte queued to wake each thread
                                     int nread;
                                     do {
-                                        nread = IOUtil.drain1(sp[0]);
+                                        nread = NIOUtil.drain1(sp[0]);
                                     } while (nread == IOStatus.INTERRUPTED);
                                 }
 

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

@@ -82,7 +82,7 @@ class KQueueSelectorImpl extends SelectorImpl {
         this.pollArrayAddress = KQueue.allocatePollArray(MAX_KEVENTS);
 
         try {
-            long fds = IOUtil.makePipe(false);
+            long fds = NIOUtil.makePipe(false);
             this.fd0 = (int) (fds >>> 32);
             this.fd1 = (int) fds;
         } catch (IOException ioe) {
@@ -323,7 +323,7 @@ public Selector wakeup() {
         synchronized (interruptLock) {
             if (!interruptTriggered) {
                 try {
-                    IOUtil.write1(fd1, (byte)0);
+                    NIOUtil.write1(fd1, (byte)0);
                 } catch (IOException ioe) {
                     throw new InternalError(ioe);
                 }
@@ -335,7 +335,7 @@ public Selector wakeup() {
 
     private void clearInterrupt() throws IOException {
         synchronized (interruptLock) {
-            IOUtil.drain(fd0);
+            NIOUtil.drain(fd0);
             interruptTriggered = false;
         }
     }

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

@@ -1144,7 +1144,7 @@ private void lockedConfigureBlocking(boolean block) throws IOException {
             ensureOpen();
             // do nothing if virtual thread has forced the socket to be non-blocking
             if (!forcedNonBlocking) {
-                IOUtil.configureBlocking(fd, block);
+                NIOUtil.configureBlocking(fd, block);
             }
         }
     }
@@ -1157,7 +1157,7 @@ private boolean tryLockedConfigureBlocking(boolean block) throws IOException {
         assert readLock.isHeldByCurrentThread() || writeLock.isHeldByCurrentThread();
         synchronized (stateLock) {
             if (!forcedNonBlocking && isOpen()) {
-                IOUtil.configureBlocking(fd, block);
+                NIOUtil.configureBlocking(fd, block);
                 return true;
             } else {
                 return false;
@@ -1174,7 +1174,7 @@ private void configureSocketNonBlocking() throws IOException {
         if (!forcedNonBlocking) {
             synchronized (stateLock) {
                 ensureOpen();
-                IOUtil.configureBlocking(fd, false);
+                NIOUtil.configureBlocking(fd, false);
                 forcedNonBlocking = true;
             }
         }
@@ -1412,7 +1412,7 @@ private void repairSocket(InetSocketAddress target)
 
             // copy the blocking mode
             if (!isBlocking() || forcedNonBlocking) {
-                IOUtil.configureBlocking(newfd, false);
+                NIOUtil.configureBlocking(newfd, false);
             }
 
             // dup this channel's socket to the new socket. If this succeeds then
@@ -1944,6 +1944,6 @@ private static native int send0(FileDescriptor fd, long address, int len,
         throws IOException;
 
     static {
-        IOUtil.load();
+        NIOUtil.load();
     }
 }

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

@@ -559,58 +559,24 @@ static long bufferAddress(ByteBuffer buf) {
         return NIO_ACCESS.getBufferAddress(buf);
     }
 
-    public static FileDescriptor newFD(int i) {
-        FileDescriptor fd = new FileDescriptor();
-        setfdVal(fd, i);
-        return fd;
-    }
-
-    static native boolean randomBytes(byte[] someBytes);
-
-    /**
-     * Returns two file descriptors for a pipe encoded in a long.
-     * The read end of the pipe is returned in the high 32 bits,
-     * while the write end is returned in the low 32 bits.
-     */
-    static native long makePipe(boolean blocking) throws IOException;
-
-    static native int write1(int fd, byte b) throws IOException;
-
-    /**
-     * Read and discard all bytes.
-     */
-    static native boolean drain(int fd) throws IOException;
-
-    /**
-     * Read and discard at most one byte
-     * @return the number of bytes read or IOS_INTERRUPTED
-     */
-    static native int drain1(int fd) throws IOException;
-
-    public static native void configureBlocking(FileDescriptor fd,
-                                                boolean blocking)
-        throws IOException;
-
     public static native int fdVal(FileDescriptor fd);
 
     static native void setfdVal(FileDescriptor fd, int value);
 
-    static native int fdLimit();
-
-    static native int iovMax();
+    private static native int iovMax();
 
-    static native long writevMax();
+    private static native long writevMax();
 
-    static native void initIDs();
+    private static native void initIDs();
 
     /**
-     * Used to trigger loading of native libraries
+     * Used to trigger initialization of static final fields and of
+     * FileDescriptor field IDs in the native layer
      */
     public static void load() { }
 
     static {
-        jdk.internal.loader.BootLoader.loadLibrary("net");
-        jdk.internal.loader.BootLoader.loadLibrary("nio");
+        // Initialize FileDescriptor field IDs in the native layer
         initIDs();
 
         IOV_MAX = iovMax();