8332154: Memory leak in SynchronousQueue

test/jdk/java/util/concurrent/tck/JSR166TestCase.java

@@ -667,6 +667,7 @@ public static Test suite() {
         if (atLeastJava20()) {
             String[] java20TestClassNames = {
                 "ForkJoinPool20Test",
+                "SynchronousQueue20Test",
             };
             addNamedTestClasses(suite, java20TestClassNames);
         }

test/jdk/java/util/concurrent/tck/SynchronousQueue20Test.java

@@ -0,0 +1,115 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * Written by Doug Lea with assistance from members of JCP JSR-166
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ * Other contributors include Andrew Wright, Jeffrey Hayes,
+ * Pat Fisher, Mike Judd.
+ */
+
+import junit.framework.Test;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.WeakHashMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.TimeUnit;
+
+public class SynchronousQueue20Test extends JSR166TestCase {
+
+    public static void main(String[] args) {
+        main(suite(), args);
+    }
+
+    public static Test suite() {
+        return newTestSuite(SynchronousQueue20Test.class);
+    }
+
+    public void testFairDoesntLeak() throws InterruptedException {
+        assertDoesntLeak(new SynchronousQueue<>(true));
+    }
+
+    public void testUnfairDoesntLeak() throws InterruptedException {
+        assertDoesntLeak(new SynchronousQueue<>(false));
+    }
+
+    private void assertDoesntLeak(SynchronousQueue<Object> queue) throws InterruptedException {
+        final int NUMBER_OF_ITEMS = 250;
+        final int MAX_ROUNDS = 200;
+        final int ROUND_WAIT_MILLIS = 50;
+
+        final CountDownLatch allProduced = new CountDownLatch(NUMBER_OF_ITEMS);
+        final CountDownLatch allConsumed = new CountDownLatch(NUMBER_OF_ITEMS);
+
+        class Item {}
+        final Map<Item, Void> survivors =
+                Collections.synchronizedMap(WeakHashMap.newWeakHashMap(NUMBER_OF_ITEMS));
+
+        for(int i = 0;i < NUMBER_OF_ITEMS;++i) {
+            Thread.ofVirtual().start(() -> {
+                var item = new Item();
+                survivors.put(item, null);
+                while(true) {
+                    try {
+                        queue.put(item);
+                        break;
+                    } catch (InterruptedException ie) {
+                        // Retry
+                    }
+                }
+                allProduced.countDown();
+            });
+
+            Thread.ofVirtual().start(() -> {
+                while(true) {
+                    try {
+                        queue.take();
+                        break;
+                    } catch (InterruptedException ie) {
+                        // Retry
+                    }
+                }
+                allConsumed.countDown();
+            });
+        }
+
+        assertTrue(allProduced.await(10, TimeUnit.SECONDS));
+        assertTrue(allConsumed.await(10, TimeUnit.SECONDS));
+        var round = 0;
+        while(!survivors.isEmpty() && round++ < MAX_ROUNDS) {
+            System.gc();
+            Thread.sleep(ROUND_WAIT_MILLIS); // We don't expect interruptions
+        }
+
+        assertTrue(survivors.isEmpty());
+        assertTrue(queue.isEmpty()); // Make sure that the queue survives until the end
+    }
+
+}

test/jdk/java/util/concurrent/tck/SynchronousQueueTest.java

@@ -38,17 +38,13 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Iterator;
-import java.util.Map;
 import java.util.NoSuchElementException;
-import java.util.WeakHashMap;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.SynchronousQueue;
-import java.util.concurrent.TimeUnit;
 
 import junit.framework.Test;
 
@@ -656,65 +652,4 @@ public void testNeverContainsNull() {
         assertFalse(q.contains(null));
         assertFalse(q.remove(null));
     }
-
-    public void testFairDoesntLeak() throws InterruptedException {
-        assertDoesntLeak(new SynchronousQueue<>(true));
-    }
-
-    public void testUnfairDoesntLeak() throws InterruptedException {
-        assertDoesntLeak(new SynchronousQueue<>(false));
-    }
-
-    private void assertDoesntLeak(SynchronousQueue<Object> queue) throws InterruptedException {
-        final int NUMBER_OF_ITEMS = 250;
-        final int MAX_ROUNDS = 200;
-        final int ROUND_WAIT_MILLIS = 50;
-
-        final CountDownLatch allProduced = new CountDownLatch(NUMBER_OF_ITEMS);
-        final CountDownLatch allConsumed = new CountDownLatch(NUMBER_OF_ITEMS);
-
-        class Item {}
-        final Map<Item, Void> survivors =
-                Collections.synchronizedMap(WeakHashMap.newWeakHashMap(NUMBER_OF_ITEMS));
-
-        for(int i = 0;i < NUMBER_OF_ITEMS;++i) {
-            new Thread(() -> {
-                var item = new Item();
-                survivors.put(item, null);
-                while(true) {
-                    try {
-                        queue.put(item);
-                        break;
-                    } catch (InterruptedException ie) {
-                        // Retry
-                    }
-                }
-                allProduced.countDown();
-            }).start();
-
-            new Thread(() -> {
-                while(true) {
-                    try {
-                        queue.take();
-                        break;
-                    } catch (InterruptedException ie) {
-                        // Retry
-                    }
-                }
-                allConsumed.countDown();
-            }).start();
-        }
-
-        assertTrue(allProduced.await(10, TimeUnit.SECONDS));
-        assertTrue(allConsumed.await(10, TimeUnit.SECONDS));
-        var round = 0;
-        while(!survivors.isEmpty() && round++ < MAX_ROUNDS) {
-            System.gc();
-            Thread.sleep(ROUND_WAIT_MILLIS); // We don't expect interruptions
-        }
-
-        assertTrue(survivors.isEmpty());
-        assertTrue(queue.isEmpty()); // Make sure that the queue survives until the end
-    }
-
 }