8317801: java/net/Socket/asyncClose/Race.java fails intermittently (aix)

Co-authored-by: Shruthi.Shruthi1 <[email protected]> Signed-off-by: Varada M <[email protected]>
openjdk · Sep 19, 2024 · 20f3462 · 20f3462
1 parent 315abdf
commit 20f3462
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 22 deletions.
diff --git a/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java
@@ -1903,11 +1903,21 @@ private void implCloseBlockingMode() throws IOException {
                     }
                     if (NativeThread.isNativeThread(reader)
                             || NativeThread.isNativeThread(writer)) {
-                        nd.preClose(fd);
-                        if (NativeThread.isNativeThread(reader))
-                            NativeThread.signal(reader);
-                        if (NativeThread.isNativeThread(writer))
-                            NativeThread.signal(writer);
+                        boolean isAix = System.getProperty("os.name").startsWith("AIX");
+                        if (isAix) {
+                            if (NativeThread.isNativeThread(reader))
+                                NativeThread.signal(reader);
+                            if (NativeThread.isNativeThread(writer))
+                                NativeThread.signal(writer);
+                                nd.preClose(fd);
+                        }
+                        else {
+                            nd.preClose(fd);
+                            if (NativeThread.isNativeThread(reader))
+                                NativeThread.signal(reader);
+                            if (NativeThread.isNativeThread(writer))
+                                NativeThread.signal(writer);
+                        }
                     }
                 }
             }

diff --git a/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java b/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java
@@ -908,11 +908,21 @@ protected void close() throws IOException {
                 }
                 if (NativeThread.isNativeThread(reader)
                         || NativeThread.isNativeThread(writer)) {
-                    nd.preClose(fd);
-                    if (NativeThread.isNativeThread(reader))
-                        NativeThread.signal(reader);
-                    if (NativeThread.isNativeThread(writer))
-                        NativeThread.signal(writer);
+                    boolean isAix = System.getProperty("os.name").startsWith("AIX");
+                    if (isAix) {
+                        if (NativeThread.isNativeThread(reader))
+                            NativeThread.signal(reader);
+                        if (NativeThread.isNativeThread(writer))
+                            NativeThread.signal(writer);
+                        nd.preClose(fd);
+                    }
+                    else {
+                        nd.preClose(fd);
+                        if (NativeThread.isNativeThread(reader))
+                            NativeThread.signal(reader);
+                        if (NativeThread.isNativeThread(writer))
+                            NativeThread.signal(writer);
+                    }
                 }
             }
         }

diff --git a/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
@@ -610,8 +610,15 @@ private void implCloseBlockingMode() throws IOException {
                     if (NativeThread.isVirtualThread(th)) {
                         Poller.stopPoll(fdVal);
                     } else {
-                        nd.preClose(fd);
-                        NativeThread.signal(th);
+                        boolean isAix = System.getProperty("os.name").startsWith("AIX");
+                        if (isAix) {
+                            NativeThread.signal(th);
+                            nd.preClose(fd);
+                        }
+                        else {
+                            nd.preClose(fd);
+                            NativeThread.signal(th);
+                        }
                     }
                 }
             }

diff --git a/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
@@ -1147,11 +1147,21 @@ private void implCloseBlockingMode() throws IOException {
                 }
                 if (NativeThread.isNativeThread(reader)
                         || NativeThread.isNativeThread(writer)) {
-                    nd.preClose(fd);
-                    if (NativeThread.isNativeThread(reader))
-                        NativeThread.signal(reader);
-                    if (NativeThread.isNativeThread(writer))
-                        NativeThread.signal(writer);
+                    boolean isAix = System.getProperty("os.name").startsWith("AIX");
+                    if (isAix) {
+                        if (NativeThread.isNativeThread(reader))
+                            NativeThread.signal(reader);
+                        if (NativeThread.isNativeThread(writer))
+                            NativeThread.signal(writer);
+                        nd.preClose(fd);
+                    }
+                    else {
+                        nd.preClose(fd);
+                        if (NativeThread.isNativeThread(reader))
+                            NativeThread.signal(reader);
+                        if (NativeThread.isNativeThread(writer))
+                            NativeThread.signal(writer);
+                    }
                 }
             }
         }

diff --git a/src/java.base/unix/classes/sun/nio/ch/SinkChannelImpl.java b/src/java.base/unix/classes/sun/nio/ch/SinkChannelImpl.java
@@ -157,8 +157,15 @@ private void implCloseBlockingMode() throws IOException {
                     if (NativeThread.isVirtualThread(th)) {
                         Poller.stopPoll(fdVal);
                     } else {
-                        nd.preClose(fd);
-                        NativeThread.signal(th);
+                        boolean isAix = System.getProperty("os.name").startsWith("AIX");
+                        if (isAix) {
+                            NativeThread.signal(th);
+                            nd.preClose(fd);
+                        }
+                        else {
+                            nd.preClose(fd);
+                            NativeThread.signal(th);
+                        }
                     }
                 }
             }

diff --git a/src/java.base/unix/classes/sun/nio/ch/SourceChannelImpl.java b/src/java.base/unix/classes/sun/nio/ch/SourceChannelImpl.java
@@ -157,8 +157,15 @@ private void implCloseBlockingMode() throws IOException {
                     if (NativeThread.isVirtualThread(th)) {
                         Poller.stopPoll(fdVal);
                     } else {
-                        nd.preClose(fd);
-                        NativeThread.signal(th);
+                        boolean isAix = System.getProperty("os.name").startsWith("AIX");
+                        if (isAix) {
+                            NativeThread.signal(th);
+                            nd.preClose(fd);
+                        }
+                        else {
+                            nd.preClose(fd);
+                            NativeThread.signal(th);
+                        }
                     }
                 }
             }

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
@@ -551,7 +551,6 @@ java/net/MulticastSocket/SetLoopbackMode.java                   7122846,8308807
 java/net/MulticastSocket/SetOutgoingIf.java                     8308807 aix-ppc64
 java/net/MulticastSocket/Test.java                              7145658,8308807 macosx-all,aix-ppc64
 
-java/net/Socket/asyncClose/Race.java                            8317801 aix-ppc64
 
 ############################################################################