SingleStep events tests fixed.

Author: lmesnik

test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep01/libsinglestep01.cpp

@@ -51,7 +51,8 @@ static const char *CLASS_SIG =
 
 static volatile jint result = PASSED;
 static jvmtiEnv *jvmti = NULL;
-static jvmtiEventCallbacks callbacks;
+
+static volatile jboolean isVirtualExpected = JNI_FALSE;
 
 static volatile int callbacksEnabled = NSK_FALSE;
 static jrawMonitorID agent_lock;
@@ -86,7 +87,7 @@ ClassLoad(jvmtiEnv *jvmti, JNIEnv *jni, jthread thread, jclass klass) {
       jni->FatalError("failed to obtain a class signature\n");
     }
     if (sig != NULL && (strcmp(sig, CLASS_SIG) == 0)) {
-      NSK_DISPLAY1(
+      printf(
           "ClassLoad event received for the class \"%s\"\n"
           "\tsetting breakpoint ...\n",
           sig);
@@ -122,7 +123,7 @@ Breakpoint(jvmtiEnv *jvmti, JNIEnv *jni, jthread thr, jmethodID method, jlocatio
   }
 
   if (sig != NULL && (strcmp(sig, CLASS_SIG) == 0)) {
-    NSK_DISPLAY1("method declaring class \"%s\"\n\tenabling SingleStep events ...\n", sig);
+    printf("method declaring class \"%s\"\n\tenabling SingleStep events ...\n", sig);
     err = jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_SINGLE_STEP, thr);
     if (err != JVMTI_ERROR_NONE) {
       result = STATUS_FAILED;
@@ -133,6 +134,7 @@ Breakpoint(jvmtiEnv *jvmti, JNIEnv *jni, jthread thr, jmethodID method, jlocatio
     NSK_COMPLAIN1("TEST FAILURE: unexpected breakpoint event in method of class \"%s\"\n\n",
                   sig);
   }
+  isVirtualExpected = jni->IsVirtualThread(thr);
   jvmti->RawMonitorExit(agent_lock);
 }
 
@@ -149,6 +151,8 @@ SingleStep(jvmtiEnv *jvmti, JNIEnv *jni, jthread thread,
 
   NSK_DISPLAY0(">>>> SingleStep event received\n");
 
+  print_thread_info(jni, jvmti, thread);
+
   err = jvmti->GetMethodName(method, &methNam, &methSig, NULL);
   if (err != JVMTI_ERROR_NONE) {
     result = STATUS_FAILED;
@@ -184,16 +188,22 @@ SingleStep(jvmtiEnv *jvmti, JNIEnv *jni, jthread thread,
         (strcmp(methSig, METHOD_SIGS[0]) == 0) &&
         (strcmp(sig, CLASS_SIG) == 0)) {
       stepEv[0]++;
-      NSK_DISPLAY1("CHECK PASSED: SingleStep event received for the method \"%s\" as expected\n",
+      printf("CHECK PASSED: SingleStep event received for the method \"%s\" as expected\n",
                    methNam);
     } else if ((strcmp(methNam, METHODS[1]) == 0) &&
         (strcmp(methSig, METHOD_SIGS[1]) == 0) &&
         (strcmp(sig, CLASS_SIG) == 0)) {
-      stepEv[1]++;
-      NSK_DISPLAY1(
-          "CHECK PASSED: SingleStep event received for the method \"%s\" as expected\n"
-          "\tdisabling the event generation\n",
-          methNam);
+      jboolean isVirtual = jni->IsVirtualThread(thread);
+      if (isVirtualExpected != isVirtual) {
+        printf("The thread IsVirtualThread %d differs from expected %d.\n", isVirtual, isVirtualExpected);
+        result = STATUS_FAILED;
+      } else {
+        stepEv[1]++;
+        printf(
+            "CHECK PASSED: SingleStep event received for the method \"%s\" as expected\n"
+            "\tdisabling the event generation\n",
+            methNam);
+      }
       err = jvmti->SetEventNotificationMode(JVMTI_DISABLE, JVMTI_EVENT_SINGLE_STEP, thread);
       if (err != JVMTI_ERROR_NONE) {
         result = STATUS_FAILED;
@@ -213,7 +223,7 @@ SingleStep(jvmtiEnv *jvmti, JNIEnv *jni, jthread thread,
     NSK_COMPLAIN0("TEST FAILED: unable to deallocate memory pointed to method signature\n\n");
   }
 
-  NSK_DISPLAY0("<<<<\n\n");
+  printf("<<<<\n\n");
 }
 
 void JNICALL
@@ -242,6 +252,8 @@ Java_singlestep01_check(JNIEnv *jni, jobject obj) {
       result = STATUS_FAILED;
       NSK_COMPLAIN1("TEST FAILED: no SingleStep events for the method \"%s\"\n\n",
                     METHODS[i]);
+    } else {
+      stepEv[i] = 0;
     }
   }
   return result;
@@ -259,6 +271,7 @@ JNIEXPORT jint JNI_OnLoad_singlestep01(JavaVM *jvm, char *options, void *reserve
 }
 #endif
 jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
+  jvmtiEventCallbacks callbacks;
   jvmtiCapabilities caps;
   jvmtiError err;
   jint res;
@@ -272,6 +285,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
   memset(&caps, 0, sizeof(jvmtiCapabilities));
   caps.can_generate_breakpoint_events = 1;
   caps.can_generate_single_step_events = 1;
+  caps.can_support_virtual_threads = 1;
 
   err = jvmti->AddCapabilities(&caps);
   if (err != JVMTI_ERROR_NONE) {
@@ -288,11 +302,11 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
   }
 
   if (!caps.can_generate_single_step_events) {
-    NSK_DISPLAY0("Warning: generation of single step events is not implemented\n");
+    printf("Warning: generation of single step events is not implemented\n");
   }
 
   /* set event callback */
-  NSK_DISPLAY0("setting event callbacks ...\n");
+  printf("setting event callbacks ...\n");
   (void) memset(&callbacks, 0, sizeof(callbacks));
   callbacks.ClassLoad = &ClassLoad;
   callbacks.Breakpoint = &Breakpoint;
@@ -304,7 +318,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     return JNI_ERR;
   }
 
-  NSK_DISPLAY0("setting event callbacks done\nenabling JVMTI events ...\n");
+  printf("setting event callbacks done\nenabling JVMTI events ...\n");
   err = jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_VM_START, NULL);
   if (err != JVMTI_ERROR_NONE) {
     return JNI_ERR;
@@ -322,7 +336,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     return JNI_ERR;
   }
 
-  NSK_DISPLAY0("enabling the events done\n\n");
+  printf("enabling the events done\n\n");
 
   err = jvmti->CreateRawMonitor("agent lock", &agent_lock);
   if (err != JVMTI_ERROR_NONE) {

test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep01/singlestep01.java

@@ -48,22 +48,6 @@
  * @run main/othervm/native -agentlib:singlestep01 singlestep01
  */
 
-
-
-/**
- * This test exercises the JVMTI event <code>SingleStep</code>.
- * <br>It verifies that this event can be enabled and disabled
- * during program execution.<br>
- * The test works as follows. Breakpoint is set at special method
- * <code>bpMethod()</code>. Upon reaching the breakpoint, agent
- * enables <code>SingleStep</code> event generation. All the received
- * events are counted. When the method <code>bpMethod()</code> is
- * leaved and accordingly, the program returns to the calling method
- * <code>runThis()</code>, the agent disables the event generation.<br>
- * At least one <code>SingleStep</code> event must be received for
- * the each methods mentioned above. Also after disabling the event
- * no more event must be received.
- */
 public class singlestep01 {
     static {
         try {
@@ -76,18 +60,30 @@ public class singlestep01 {
         }
     }
 
+    static volatile int result;
     native int check();
 
-    public static void main(String[] argv) {
-        int result = new singlestep01().runThis();
+    public static void main(String[] argv) throws Exception {
+        Thread thread = Thread.builder().task(() -> {
+             result = new singlestep01().runThis();
+        }).build();
+        thread.start();
+        thread.join();
+        if (result != 0) {
+            throw new RuntimeException("Unexpected status: " + result);
+        }
+        thread = Thread.builder().task(() -> {
+            result = new singlestep01().runThis();
+        }).virtual().build();
+        thread.start();
+        thread.join();
         if (result != 0) {
             throw new RuntimeException("Unexpected status: " + result);
         }
     }
 
     private int runThis() {
 
-
         Thread.currentThread().setName("singlestep01Thr");
 
         System.out.println("\nReaching a breakpoint method ...\n");

test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep02/libsinglestep02.cpp

@@ -36,7 +36,6 @@ static volatile jint result = PASSED;
 static volatile long wrongStepEv = 0;
 
 static jvmtiEnv *jvmti = NULL;
-static jvmtiEventCallbacks callbacks;
 
 /** callback functions **/
 void JNICALL
@@ -53,8 +52,7 @@ SingleStep(jvmtiEnv *jvmti, JNIEnv *jni, jthread thread,
     if (phase != JVMTI_PHASE_LIVE) {
       wrongStepEv++;
       result = STATUS_FAILED;
-      NSK_COMPLAIN1("TEST FAILED: SingleStep event received during non-live phase %s\n",
-                    TranslatePhase(phase));
+      NSK_COMPLAIN1("TEST FAILED: SingleStep event received during non-live phase %s\n", TranslatePhase(phase));
     }
   }
 }
@@ -68,10 +66,12 @@ VMDeath(jvmtiEnv *jvmti, JNIEnv *jni) {
         "TEST FAILED: there are %ld SingleStep events\n"
         "sent during non-live phase of the VM execution\n",
         wrongStepEv);
+    jni->FatalError("Test Failed.");
   }
 
-  if (result == STATUS_FAILED)
-    exit(95 + STATUS_FAILED);
+  if (result == STATUS_FAILED) {
+    jni->FatalError("Test Failed.");
+  }
 }
 /************************/
 
@@ -87,6 +87,7 @@ JNIEXPORT jint JNI_OnLoad_singlestep02(JavaVM *jvm, char *options, void *reserve
 }
 #endif
 jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
+  jvmtiEventCallbacks callbacks;
   jvmtiCapabilities caps;
   jvmtiError err;
   jint res;
@@ -113,8 +114,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
            TranslateError(err), err);
     return JNI_ERR;
   }
-  if (!caps.can_generate_single_step_events)
-    NSK_DISPLAY0("Warning: generation of single step events is not implemented\n");
+  if (!caps.can_generate_single_step_events) {
+    printf("Warning: generation of single step events is not implemented\n");
+    return JNI_ERR;
+  }
 
   /* set event callback */
   NSK_DISPLAY0("setting event callbacks ...\n");

test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep02/singlestep02.java

@@ -43,18 +43,6 @@
  * @run main/othervm/native -agentlib:singlestep02 singlestep02
  */
 
-
-
-
-/**
- * This test exercises the JVMTI event <code>SingleStep</code>.
- * <br>It verifies that this event is sent only during the live
- * phase of VM execution.<br>
- * The test works as follows. The tested event is enabled in the
- * <code>OnLoad</code> phase. Then all received <code>SingleStep</code>
- * events is checked to be sent only during the live phase via
- * the <code>GetPhase()</code> call.
- */
 public class singlestep02 {
 
     static {
@@ -68,8 +56,8 @@ public class singlestep02 {
         }
     }
 
-    public static void main(String[] argv) {
-        new singlestep02().runThis(argv);
+    public static void main(String[] args) {
+        new singlestep02().runThis(args);
     }
 
     private int runThis(String argv[]) {

test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep03/singlestep03.java

@@ -44,23 +44,10 @@
  * COMMENTS
  *
  * @library /test/lib
- * @run main/othervm/native -agentlib:singlestep03 singlestep03
+ * @run main/othervm/native -agentlib:singlestep03 singlestep03 kernel
+ * @run main/othervm/native -agentlib:singlestep03 singlestep03 virtual
  */
 
-/**
- * This test exercises the JVMTI event <code>SingleStep</code>.
- * <br>It verifies that no single step event will be generated from
- * within native methods.<br>
- * The test works as follows. Breakpoint is set at special method
- * <code>bpMethod()</code>. Upon reaching the breakpoint, agent
- * enables <code>SingleStep</code> event generation and checks the
- * events. The java part calls native method <code>nativeMethod()</code>
- * which calls another native <code>anotherNativeMethod()</code>
- * in order to provoke the SingleStep events from within native
- * methods. When <code>bpMethod()</code> is leaved and accordingly,
- * the program returns to the calling method <code>runThis()</code>,
- * the agent disables the event generation.
- */
 public class singlestep03 {
     static {
         try {
@@ -73,13 +60,22 @@ public class singlestep03 {
         }
     }
 
+    static volatile int result;
     native void nativeMethod();
     native void anotherNativeMethod(int i);
 
     native int check();
 
-    public static void main(String[] argv) {
-        int result = new singlestep03().runThis();
+    public static void main(String[] args) throws Exception {
+        Thread.Builder threadBuilder = Thread.builder().task(() -> {
+            result = new singlestep03().runThis();
+        });
+        if ("virtual".equals(args[0])) {
+            threadBuilder = threadBuilder.virtual();
+        }
+        Thread thread = threadBuilder.build();
+        thread.start();
+        thread.join();
         if (result != 0) {
             throw new RuntimeException("Unexpected status: " + result);
         }

test/lib/jdk/test/lib/jvmti/jvmti_common.h

@@ -37,7 +37,6 @@
 #define NSK_DISPLAY1 printf
 #define NSK_DISPLAY2 printf
 #define NSK_DISPLAY3 printf
-#define NSK_DISPLAY4 printf
 
 
 #define NSK_COMPLAIN0 printf