8318467: [jmh] tests concurrent.Queues and concurrent.ProducerConsumer hang with 101+ threads

Backport-of: e05cafda78a37dbeb2df2edd791be19d22edaece

Author: rm-gh-8

test/micro/org/openjdk/bench/java/util/concurrent/ProducerConsumer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2023, 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
@@ -32,6 +32,7 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.TearDown;
 import org.openjdk.jmh.infra.Blackhole;
+import org.openjdk.jmh.infra.ThreadParams;
 
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
@@ -49,7 +50,7 @@
 @State(Scope.Benchmark)
 public class ProducerConsumer {
 
-    @Param("100")
+    @Param("100") // Will be expanded to at least the number of threads used
     private int capacity;
 
     @Param
@@ -59,7 +60,9 @@ public class ProducerConsumer {
     private Producer prod;
 
     @Setup
-    public void prepare() {
+    public void prepare(ThreadParams params) {
+        capacity = Math.max(params.getThreadCount(), capacity);
+
         switch (type) {
             case ABQ_F:
                 q = new ArrayBlockingQueue<>(capacity, true);

test/micro/org/openjdk/bench/java/util/concurrent/Queues.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2023, 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
@@ -31,6 +31,7 @@
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.infra.Blackhole;
+import org.openjdk.jmh.infra.ThreadParams;
 
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
@@ -43,7 +44,7 @@
 @State(Scope.Benchmark)
 public class Queues {
 
-    @Param("100")
+    @Param("100") // Will be expanded to at least the number of threads used
     private int capacity;
 
     @Param
@@ -59,7 +60,9 @@ public enum QueueType {
     private BlockingQueue<Integer> q;
 
     @Setup
-    public void setup() {
+    public void setup(ThreadParams params) {
+        capacity = Math.max(params.getThreadCount(), capacity);
+
         switch (type) {
             case ABQ_F:
                 q = new ArrayBlockingQueue<>(capacity, true);