ART: Rewrite test 911

Use explicit thread names to avoid output reliance on implicit
thread naming.

Bug: 31684812
Test: m test-art-host-run-test-911-get-stack-trace
Change-Id: I82004fea6f49831b5d378bef2c290b61c694a07a

5 files changed, 81 insertions, 81 deletions

diff --git a/test/911-get-stack-trace/expected.txt b/test/911-get-stack-trace/expected.txt
index 2687f85b09..feabb2087e 100644
--- a/test/911-get-stack-trace/expected.txt
+++ b/test/911-get-stack-trace/expected.txt
@@ -211,52 +211,34 @@ From bottom
 ### Other threads (suspended) ###
 ################################
 ---------
-FinalizerDaemon
-<not printed>
----------
-FinalizerWatchdogDaemon
-<not printed>
----------
-HeapTaskDaemon
-<not printed>
----------
-ReferenceQueueDaemon
-<not printed>
----------
-Signal Catcher
-
----------
-Thread-10
+AllTraces Thread 0
 
 ---------
-Thread-11
+AllTraces Thread 1
 
 ---------
-Thread-12
+AllTraces Thread 2
 
 ---------
-Thread-13
+AllTraces Thread 3
 
 ---------
-Thread-4
+AllTraces Thread 4
 
 ---------
-Thread-5
+AllTraces Thread 5
 
 ---------
-Thread-6
+AllTraces Thread 6
 
 ---------
-Thread-7
+AllTraces Thread 7
 
 ---------
-Thread-8
+AllTraces Thread 8
 
 ---------
-Thread-9
-
----------
-main
+AllTraces Thread 9
 
 ---------
 FinalizerDaemon
@@ -274,7 +256,10 @@ ReferenceQueueDaemon
 Signal Catcher
 
 ---------
-Thread-10
+main
+
+---------
+AllTraces Thread 0
  wait ()V -1 -2
  printOrWait (IILControlData;)V 24 45
  baz (IIILControlData;)Ljava/lang/Object; 2 30
@@ -282,7 +267,7 @@ Thread-10
  foo (IIILControlData;)I 0 19
 
 ---------
-Thread-11
+AllTraces Thread 1
  wait ()V -1 -2
  printOrWait (IILControlData;)V 24 45
  baz (IIILControlData;)Ljava/lang/Object; 2 30
@@ -290,7 +275,7 @@ Thread-11
  foo (IIILControlData;)I 0 19
 
 ---------
-Thread-12
+AllTraces Thread 2
  wait ()V -1 -2
  printOrWait (IILControlData;)V 24 45
  baz (IIILControlData;)Ljava/lang/Object; 2 30
@@ -298,7 +283,7 @@ Thread-12
  foo (IIILControlData;)I 0 19
 
 ---------
-Thread-13
+AllTraces Thread 3
  wait ()V -1 -2
  printOrWait (IILControlData;)V 24 45
  baz (IIILControlData;)Ljava/lang/Object; 2 30
@@ -306,7 +291,7 @@ Thread-13
  foo (IIILControlData;)I 0 19
 
 ---------
-Thread-4
+AllTraces Thread 4
  wait ()V -1 -2
  printOrWait (IILControlData;)V 24 45
  baz (IIILControlData;)Ljava/lang/Object; 2 30
@@ -314,7 +299,7 @@ Thread-4
  foo (IIILControlData;)I 0 19
 
 ---------
-Thread-5
+AllTraces Thread 5
  wait ()V -1 -2
  printOrWait (IILControlData;)V 24 45
  baz (IIILControlData;)Ljava/lang/Object; 2 30
@@ -322,7 +307,7 @@ Thread-5
  foo (IIILControlData;)I 0 19
 
 ---------
-Thread-6
+AllTraces Thread 6
  wait ()V -1 -2
  printOrWait (IILControlData;)V 24 45
  baz (IIILControlData;)Ljava/lang/Object; 2 30
@@ -330,7 +315,7 @@ Thread-6
  foo (IIILControlData;)I 0 19
 
 ---------
-Thread-7
+AllTraces Thread 7
  wait ()V -1 -2
  printOrWait (IILControlData;)V 24 45
  baz (IIILControlData;)Ljava/lang/Object; 2 30
@@ -338,7 +323,7 @@ Thread-7
  foo (IIILControlData;)I 0 19
 
 ---------
-Thread-8
+AllTraces Thread 8
  wait ()V -1 -2
  printOrWait (IILControlData;)V 24 45
  baz (IIILControlData;)Ljava/lang/Object; 2 30
@@ -346,7 +331,7 @@ Thread-8
  foo (IIILControlData;)I 0 19
 
 ---------
-Thread-9
+AllTraces Thread 9
  wait ()V -1 -2
  printOrWait (IILControlData;)V 24 45
  baz (IIILControlData;)Ljava/lang/Object; 2 30
@@ -354,13 +339,6 @@ Thread-9
  foo (IIILControlData;)I 0 19
 
 ---------
-main
- getAllStackTraces (I)[[Ljava/lang/Object; -1 -2
- printAll (I)V 0 73
- doTest ()V 102 57
- main ([Ljava/lang/String;)V 27 33
-
----------
 FinalizerDaemon
 <not printed>
 ---------
@@ -376,7 +354,14 @@ ReferenceQueueDaemon
 Signal Catcher
 
 ---------
-Thread-10
+main
+ getAllStackTraces (I)[[Ljava/lang/Object; -1 -2
+ printAll (I)V 0 73
+ doTest ()V 128 57
+ main ([Ljava/lang/String;)V 27 33
+
+---------
+AllTraces Thread 0
  wait ()V -1 -2
  printOrWait (IILControlData;)V 24 45
  baz (IIILControlData;)Ljava/lang/Object; 2 30
@@ -397,7 +382,7 @@ Thread-10
  run ()V 4 45
 
 ---------
-Thread-11
+AllTraces Thread 1
  wait ()V -1 -2
  printOrWait (IILControlData;)V 24 45
  baz (IIILControlData;)Ljava/lang/Object; 2 30
@@ -418,7 +403,7 @@ Thread-11
  run ()V 4 45
 
 ---------
-Thread-12
+AllTraces Thread 2
  wait ()V -1 -2
  printOrWait (IILControlData;)V 24 45
  baz (IIILControlData;)Ljava/lang/Object; 2 30
@@ -439,7 +424,7 @@ Thread-12
  run ()V 4 45
 
 ---------
-Thread-13
+AllTraces Thread 3
  wait ()V -1 -2
  printOrWait (IILControlData;)V 24 45
  baz (IIILControlData;)Ljava/lang/Object; 2 30
@@ -460,7 +445,7 @@ Thread-13
  run ()V 4 45
 
 ---------
-Thread-4
+AllTraces Thread 4
  wait ()V -1 -2
  printOrWait (IILControlData;)V 24 45
  baz (IIILControlData;)Ljava/lang/Object; 2 30
@@ -481,7 +466,7 @@ Thread-4
  run ()V 4 45
 
 ---------
-Thread-5
+AllTraces Thread 5
  wait ()V -1 -2
  printOrWait (IILControlData;)V 24 45
  baz (IIILControlData;)Ljava/lang/Object; 2 30
@@ -502,7 +487,7 @@ Thread-5
  run ()V 4 45
 
 ---------
-Thread-6
+AllTraces Thread 6
  wait ()V -1 -2
  printOrWait (IILControlData;)V 24 45
  baz (IIILControlData;)Ljava/lang/Object; 2 30
@@ -523,7 +508,7 @@ Thread-6
  run ()V 4 45
 
 ---------
-Thread-7
+AllTraces Thread 7
  wait ()V -1 -2
  printOrWait (IILControlData;)V 24 45
  baz (IIILControlData;)Ljava/lang/Object; 2 30
@@ -544,7 +529,7 @@ Thread-7
  run ()V 4 45
 
 ---------
-Thread-8
+AllTraces Thread 8
  wait ()V -1 -2
  printOrWait (IILControlData;)V 24 45
  baz (IIILControlData;)Ljava/lang/Object; 2 30
@@ -565,7 +550,7 @@ Thread-8
  run ()V 4 45
 
 ---------
-Thread-9
+AllTraces Thread 9
  wait ()V -1 -2
  printOrWait (IILControlData;)V 24 45
  baz (IIILControlData;)Ljava/lang/Object; 2 30
@@ -586,10 +571,25 @@ Thread-9
  run ()V 4 45
 
 ---------
+FinalizerDaemon
+<not printed>
+---------
+FinalizerWatchdogDaemon
+<not printed>
+---------
+HeapTaskDaemon
+<not printed>
+---------
+ReferenceQueueDaemon
+<not printed>
+---------
+Signal Catcher
+
+---------
 main
  getAllStackTraces (I)[[Ljava/lang/Object; -1 -2
  printAll (I)V 0 73
- doTest ()V 107 59
+ doTest ()V 133 59
  main ([Ljava/lang/String;)V 27 33
 
 
@@ -597,25 +597,25 @@ main
 ### Other select threads (suspended) ###
 ########################################
 ---------
-Thread-14
+ThreadListTraces Thread 0
 
 ---------
-Thread-16
+ThreadListTraces Thread 2
 
 ---------
-Thread-18
+ThreadListTraces Thread 4
 
 ---------
-Thread-20
+ThreadListTraces Thread 6
 
 ---------
-Thread-22
+ThreadListTraces Thread 8
 
 ---------
 main
 
 ---------
-Thread-14
+ThreadListTraces Thread 0
  wait ()V -1 -2
  printOrWait (IILControlData;)V 24 45
  baz (IIILControlData;)Ljava/lang/Object; 2 30
@@ -623,7 +623,7 @@ Thread-14
  foo (IIILControlData;)I 0 19
 
 ---------
-Thread-16
+ThreadListTraces Thread 2
  wait ()V -1 -2
  printOrWait (IILControlData;)V 24 45
  baz (IIILControlData;)Ljava/lang/Object; 2 30
@@ -631,7 +631,7 @@ Thread-16
  foo (IIILControlData;)I 0 19
 
 ---------
-Thread-18
+ThreadListTraces Thread 4
  wait ()V -1 -2
  printOrWait (IILControlData;)V 24 45
  baz (IIILControlData;)Ljava/lang/Object; 2 30
@@ -639,7 +639,7 @@ Thread-18
  foo (IIILControlData;)I 0 19
 
 ---------
-Thread-20
+ThreadListTraces Thread 6
  wait ()V -1 -2
  printOrWait (IILControlData;)V 24 45
  baz (IIILControlData;)Ljava/lang/Object; 2 30
@@ -647,7 +647,7 @@ Thread-20
  foo (IIILControlData;)I 0 19
 
 ---------
-Thread-22
+ThreadListTraces Thread 8
  wait ()V -1 -2
  printOrWait (IILControlData;)V 24 45
  baz (IIILControlData;)Ljava/lang/Object; 2 30
@@ -658,11 +658,11 @@ Thread-22
 main
  getThreadListStackTraces ([Ljava/lang/Thread;I)[[Ljava/lang/Object; -1 -2
  printList ([Ljava/lang/Thread;I)V 0 66
- doTest ()V 96 52
+ doTest ()V 116 52
  main ([Ljava/lang/String;)V 35 37
 
 ---------
-Thread-14
+ThreadListTraces Thread 0
  wait ()V -1 -2
  printOrWait (IILControlData;)V 24 45
  baz (IIILControlData;)Ljava/lang/Object; 2 30
@@ -683,7 +683,7 @@ Thread-14
  run ()V 4 35
 
 ---------
-Thread-16
+ThreadListTraces Thread 2
  wait ()V -1 -2
  printOrWait (IILControlData;)V 24 45
  baz (IIILControlData;)Ljava/lang/Object; 2 30
@@ -704,7 +704,7 @@ Thread-16
  run ()V 4 35
 
 ---------
-Thread-18
+ThreadListTraces Thread 4
  wait ()V -1 -2
  printOrWait (IILControlData;)V 24 45
  baz (IIILControlData;)Ljava/lang/Object; 2 30
@@ -725,7 +725,7 @@ Thread-18
  run ()V 4 35
 
 ---------
-Thread-20
+ThreadListTraces Thread 6
  wait ()V -1 -2
  printOrWait (IILControlData;)V 24 45
  baz (IIILControlData;)Ljava/lang/Object; 2 30
@@ -746,7 +746,7 @@ Thread-20
  run ()V 4 35
 
 ---------
-Thread-22
+ThreadListTraces Thread 8
  wait ()V -1 -2
  printOrWait (IILControlData;)V 24 45
  baz (IIILControlData;)Ljava/lang/Object; 2 30
@@ -770,7 +770,7 @@ Thread-22
 main
  getThreadListStackTraces ([Ljava/lang/Thread;I)[[Ljava/lang/Object; -1 -2
  printList ([Ljava/lang/Thread;I)V 0 66
- doTest ()V 101 54
+ doTest ()V 121 54
  main ([Ljava/lang/String;)V 35 37
 
 
diff --git a/test/911-get-stack-trace/src/AllTraces.java b/test/911-get-stack-trace/src/AllTraces.java
index adf6f38f5a..1d9aa96d6e 100644
--- a/test/911-get-stack-trace/src/AllTraces.java
+++ b/test/911-get-stack-trace/src/AllTraces.java
@@ -26,8 +26,8 @@ public class AllTraces {
     System.out.println("################################");
 
     // Also create an unstarted and a dead thread.
-    RETAIN.add(new Thread());
-    Thread deadThread = new Thread();
+    RETAIN.add(new Thread("UNSTARTED"));
+    Thread deadThread = new Thread("DEAD");
     RETAIN.add(deadThread);
     deadThread.start();
     deadThread.join();
@@ -40,7 +40,7 @@ public class AllTraces {
     Thread threads[] = new Thread[N];
 
     for (int i = 0; i < N; i++) {
-      Thread t = new Thread() {
+      Thread t = new Thread("AllTraces Thread " + i) {
         public void run() {
           Recurse.foo(4, 0, 0, data);
         }
diff --git a/test/911-get-stack-trace/src/Frames.java b/test/911-get-stack-trace/src/Frames.java
index a1a11c3785..54d4165130 100644
--- a/test/911-get-stack-trace/src/Frames.java
+++ b/test/911-get-stack-trace/src/Frames.java
@@ -59,7 +59,7 @@ public class Frames {
     System.out.println("################################");
     final ControlData data = new ControlData();
     data.waitFor = new Object();
-    Thread t = new Thread() {
+    Thread t = new Thread("Frames doTestOtherThreadWait") {
       public void run() {
         Recurse.foo(4, 0, 0, data);
       }
@@ -97,7 +97,7 @@ public class Frames {
     System.out.println("### Other thread (live) ###");
     System.out.println("###########################");
     final ControlData data = new ControlData();
-    Thread t = new Thread() {
+    Thread t = new Thread("Frames doTestOtherThreadBusyLoop") {
       public void run() {
         Recurse.foo(4, 0, 0, data);
       }
diff --git a/test/911-get-stack-trace/src/OtherThread.java b/test/911-get-stack-trace/src/OtherThread.java
index 0748433a20..0a78523a91 100644
--- a/test/911-get-stack-trace/src/OtherThread.java
+++ b/test/911-get-stack-trace/src/OtherThread.java
@@ -21,7 +21,7 @@ public class OtherThread {
     System.out.println("################################");
     final ControlData data = new ControlData();
     data.waitFor = new Object();
-    Thread t = new Thread() {
+    Thread t = new Thread("OtherThread doTestOtherThreadWait") {
       public void run() {
         Recurse.foo(4, 0, 0, data);
       }
@@ -54,7 +54,7 @@ public class OtherThread {
     System.out.println("### Other thread (live) ###");
     System.out.println("###########################");
     final ControlData data = new ControlData();
-    Thread t = new Thread() {
+    Thread t = new Thread("OtherThread doTestOtherThreadBusyLoop") {
       public void run() {
         Recurse.foo(4, 0, 0, data);
       }
diff --git a/test/911-get-stack-trace/src/ThreadListTraces.java b/test/911-get-stack-trace/src/ThreadListTraces.java
index f66557f3bd..14868e9c36 100644
--- a/test/911-get-stack-trace/src/ThreadListTraces.java
+++ b/test/911-get-stack-trace/src/ThreadListTraces.java
@@ -30,7 +30,7 @@ public class ThreadListTraces {
     Thread list[] = new Thread[N/2 + 1];
 
     for (int i = 0; i < N; i++) {
-      Thread t = new Thread() {
+      Thread t = new Thread("ThreadListTraces Thread " + i) {
         public void run() {
           Recurse.foo(4, 0, 0, data);
         }