Merge jdk-12+17
authordcubed
Wed, 24 Oct 2018 11:05:22 -0400
changeset 52274 eefa65e142af
parent 52273 97b761e247b3 (diff)
parent 52272 be166557c8dc (current diff)
child 52275 f39073b97db7
Merge
--- a/test/hotspot/jtreg/vmTestbase/metaspace/stressDictionary/StressDictionary.java	Wed Oct 24 11:02:55 2018 -0400
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressDictionary/StressDictionary.java	Wed Oct 24 11:05:22 2018 -0400
@@ -29,7 +29,7 @@
  *
  * @library /vmTestbase /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
- * @run main/othervm metaspace.stressDictionary.StressDictionary -stressTime 30
+ * @run main/othervm/timeout=300 metaspace.stressDictionary.StressDictionary -stressTime 30
  */
 
 package metaspace.stressDictionary;
@@ -123,11 +123,54 @@
             tasks.add(this.new RegularWorker());
         }
         ExecutorService executorService = Executors.newCachedThreadPool();
+        List<Future<Object>> results = null;
         try {
-            executorService.invokeAll(tasks);
+            results = executorService.invokeAll(tasks);
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
+
+        int act_results = results.size();
+        int exp_results = NUMBER_OF_CORRUPTING_THREADS +
+                          NUMBER_OF_NOT_CORRUPTING_THREADS;
+        if (act_results == exp_results) {
+            System.err.println("INFO: There are " + act_results + " results.");
+        } else {
+            throw new RuntimeException("Wrong # of results from invokeAll(); "
+                                       + "exp_results=" + exp_results + "; "
+                                       + "act_results=" + act_results + ".");
+        }
+
+        int cancelled_cnt = 0;
+        int not_done_cnt = 0;
+        for (int i = 0; i < act_results; i++) {
+            if (!results.get(i).isDone()) {
+                not_done_cnt++;
+                System.err.println("ERROR: task #" + i + " is not done.");
+            }
+            if (results.get(i).isCancelled()) {
+                cancelled_cnt++;
+                System.err.println("ERROR: task #" + i + " was canceled.");
+            }
+        }
+
+        if (cancelled_cnt == 0) {
+            System.err.println("INFO: no tasks were cancelled.");
+        }
+        if (not_done_cnt == 0) {
+            System.err.println("INFO: all tasks are done.");
+        }
+        if (cancelled_cnt != 0 && not_done_cnt != 0) {
+            throw new RuntimeException(cancelled_cnt
+                                       + " tasks were cancelled and "
+                                       + not_done_cnt
+                                       + " tasks are not done.");
+        } else if (cancelled_cnt != 0) {
+            throw new RuntimeException(cancelled_cnt
+                                       + " tasks were cancelled.");
+        } else if (not_done_cnt != 0) {
+            throw new RuntimeException(not_done_cnt + " tasks are not done.");
+        }
     }
 
     private byte[] generateAndCompile() {