[Wisp] fix testcases related to trace

Summary: as title

Testing: ci jtreg

Reviewers: yulei, shuangheng

Issue: #952

CR: https://code.alibaba-inc.com/xcode/jdk11/codereview/

Author: jia-wei-tang

test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/ThreadController.java

@@ -653,7 +653,9 @@ public SleepingThread(ThreadController controller, String name, Log log, Threads
         this.threadsGroupLocks = threadsGroupLocks;
 
         expectedLength += 3;
+        expectedLength += 1; // 1 for wisp
 
+        expectedMethods.add(Thread.class.getName() + ".sleep0");
         expectedMethods.add(Thread.class.getName() + ".sleep");
         expectedMethods.add(SleepingThread.class.getName() + ".run");
 
@@ -720,7 +722,9 @@ public RunningThread(ThreadController controller, String name, Log log, ThreadsG
         this.threadsGroupLocks = threadsGroupLocks;
 
         expectedLength += 2;
+        expectedLength += 1; // 1 for wisp
 
+        expectedMethods.add(Thread.class.getName() + ".yield0");
         expectedMethods.add(Thread.class.getName() + ".yield");
 
         switch (controller.invocationType) {

test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/thread/strace001.java

@@ -139,7 +139,9 @@ private static boolean fillTrace() {
         switch (controller.getInvocationType()) {
             case ThreadController.JAVA_TYPE:
                 expectedTrace = new String[] {
-                    "java.lang.Thread.sleep"
+                    "java.lang.Thread.sleep0"
+                    ,"java.lang.Thread.sleep"
+                    , "java.lang.Thread.yield0"
                     , "java.lang.Thread.yield"
                     , THREAD_NAME + ".waitForSign"
                     , THREAD_NAME + ".recursionJava"
@@ -149,7 +151,9 @@ private static boolean fillTrace() {
 
             case ThreadController.NATIVE_TYPE:
                 expectedTrace = new String[] {
-                    "java.lang.Thread.sleep"
+                    "java.lang.Thread.sleep0"
+                    ,"java.lang.Thread.sleep"
+                    , "java.lang.Thread.yield0"
                     , "java.lang.Thread.yield"
                     , THREAD_NAME + ".waitForSign"
                     , THREAD_NAME + ".recursionNative"
@@ -159,7 +163,9 @@ private static boolean fillTrace() {
 
             case ThreadController.MIXED_TYPE:
                 expectedTrace = new String[] {
-                    "java.lang.Thread.sleep"
+                    "java.lang.Thread.sleep0"
+                    ,"java.lang.Thread.sleep"
+                    , "java.lang.Thread.yield0"
                     , "java.lang.Thread.yield"
                     , THREAD_NAME + ".waitForSign"
                     , THREAD_NAME + ".recursionNative"
@@ -193,7 +199,7 @@ private static void printStackTrace(StackTraceElement[] elements) {
     // The method performs checks of the stack trace
     private static boolean checkTrace(StackTraceElement[] elements) {
         int length = elements.length;
-        int expectedLength = depth +3;
+        int expectedLength = depth + 3 + 1; // 1 for wisp
         boolean result = true;
 
         // Check the length of the trace. It must not be greater than

test/hotspot/jtreg/vmTestbase/nsk/stress/strace/strace003.java

@@ -117,6 +117,7 @@ public class strace003 {
             "java.lang.System.arraycopy",
             "java.lang.Object.wait",
             "java.lang.Thread.exit",
+            "java.lang.Thread.yield0",
             "java.lang.Thread.yield",
             "java.lang.ThreadGroup.remove",
             "java.lang.ThreadGroup.threadTerminated",

test/hotspot/jtreg/vmTestbase/nsk/stress/strace/strace004.java

@@ -110,6 +110,7 @@ public class strace004 {
             "java.lang.System.arraycopy",
             "java.lang.Object.wait",
             "java.lang.Thread.exit",
+            "java.lang.Thread.yield0",
             "java.lang.Thread.yield",
             "java.lang.ThreadGroup.remove",
             "java.lang.ThreadGroup.threadTerminated",

test/hotspot/jtreg/vmTestbase/nsk/stress/strace/strace005.java

@@ -136,6 +136,7 @@ public class strace005 {
             "java.lang.System.arraycopy",
             "java.lang.Object.wait",
             "java.lang.Thread.exit",
+            "java.lang.Thread.yield0",
             "java.lang.Thread.yield",
             "java.lang.ThreadGroup.remove",
             "java.lang.ThreadGroup.threadTerminated",

test/hotspot/jtreg/vmTestbase/nsk/stress/strace/strace006.java

@@ -76,6 +76,7 @@ public class strace006 {
             "java.lang.System.arraycopy",
             "java.lang.Object.wait",
             "java.lang.Thread.exit",
+            "java.lang.Thread.yield0",
             "java.lang.Thread.yield",
             "java.lang.ThreadGroup.remove",
             "java.lang.ThreadGroup.threadTerminated",