Revert "Make tests 1995, 2001, & 2005 less likely to OOME."
This reverts commit 455bb387134bda286799ed727d4b33762ef1d5b1.
Bug: 147190668
Bug: 147278184
Reason for revert: b/147278184
Change-Id: I2f81641ed3c69825207f425036e47f37c0eed687
diff --git a/test/1995-final-virtual-structural-multithread/src/art/Test1995.java b/test/1995-final-virtual-structural-multithread/src/art/Test1995.java
index 7073494..1ffee60 100644
--- a/test/1995-final-virtual-structural-multithread/src/art/Test1995.java
+++ b/test/1995-final-virtual-structural-multithread/src/art/Test1995.java
@@ -22,8 +22,6 @@
import java.util.concurrent.CountDownLatch;
public class Test1995 {
private static final int NUM_THREADS = 20;
- // Don't perform more than this many repeats per thread to prevent OOMEs
- private static final int TASK_COUNT_LIMIT = 1000;
public static final class Transform {
public String greetingEnglish;
@@ -109,14 +107,14 @@
public MyThread(CountDownLatch delay, int id) {
super("Thread: " + id);
this.thr_id = id;
- this.results = new ArrayList<>(TASK_COUNT_LIMIT);
+ this.results = new ArrayList<>(1000);
this.finish = false;
this.delay = delay;
}
public void run() {
delay.countDown();
- while (!finish && results.size() < TASK_COUNT_LIMIT) {
+ while (!finish) {
Transform t = new Transform();
results.add(t.sayHi());
}
diff --git a/test/2001-virtual-structural-multithread/src-art/art/Test2001.java b/test/2001-virtual-structural-multithread/src-art/art/Test2001.java
index 40972db..e6ee0ce 100644
--- a/test/2001-virtual-structural-multithread/src-art/art/Test2001.java
+++ b/test/2001-virtual-structural-multithread/src-art/art/Test2001.java
@@ -25,8 +25,6 @@
public class Test2001 {
private static final int NUM_THREADS = 20;
- // Don't perform more than this many repeats per thread to prevent OOMEs
- private static final int TASK_COUNT_LIMIT = 1000;
public static class Transform {
public String greetingEnglish;
@@ -169,14 +167,14 @@
public MyThread(CountDownLatch delay, int id) {
super("Thread: " + id);
this.thr_id = id;
- this.results = new ArrayList<>(TASK_COUNT_LIMIT);
+ this.results = new ArrayList<>(1000);
this.finish = false;
this.delay = delay;
}
public void run() {
delay.countDown();
- while (!finish && results.size() < TASK_COUNT_LIMIT) {
+ while (!finish) {
Supplier<String> t = mkTransform();
results.add(t.get());
}
diff --git a/test/2005-pause-all-redefine-multithreaded/src/art/Test2005.java b/test/2005-pause-all-redefine-multithreaded/src/art/Test2005.java
index efae915..6fdadb7 100644
--- a/test/2005-pause-all-redefine-multithreaded/src/art/Test2005.java
+++ b/test/2005-pause-all-redefine-multithreaded/src/art/Test2005.java
@@ -22,8 +22,6 @@
public class Test2005 {
private static final int NUM_THREADS = 20;
private static final String DEFAULT_VAL = "DEFAULT_VALUE";
- // Don't perform more than this many repeats per thread to prevent OOMEs
- private static final int TASK_COUNT_LIMIT = 1000;
public static final class Transform {
public String greetingEnglish;
@@ -110,14 +108,14 @@
public MyThread(CountDownLatch delay, int id) {
super("Thread: " + id);
this.thr_id = id;
- this.results = new ArrayList<>(TASK_COUNT_LIMIT);
+ this.results = new ArrayList<>(1000);
this.finish = false;
this.delay = delay;
}
public void run() {
delay.countDown();
- while (!finish && results.size() < TASK_COUNT_LIMIT) {
+ while (!finish) {
Transform t = new Transform();
results.add(t.sayHi());
}
