refactor testcase and change the location of fix codes

jia-wei-tang · Jul 30, 2024 · 1b0de48 · 1b0de48
1 parent 723b1ec
commit 1b0de48
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 18 deletions.
diff --git a/src/hotspot/share/prims/jvmtiExport.cpp b/src/hotspot/share/prims/jvmtiExport.cpp
@@ -929,9 +929,8 @@ class JvmtiClassFileLoadHookPoster : public StackObj {
     _cached_class_file_ptr = cache_ptr;
     _has_been_modified = false;
 
-    if (_thread->is_in_any_VTMS_transition()) {
-      return; // no events should be posted if thread is in any VTMS transition
-    }
+    assert(!_thread->is_in_any_VTMS_transition(), "CFLH events are not allowed in any VTMS transition");
+
     _state = JvmtiExport::get_jvmti_thread_state(_thread);
     if (_state != nullptr) {
       _class_being_redefined = _state->get_class_being_redefined();
@@ -965,9 +964,6 @@ class JvmtiClassFileLoadHookPoster : public StackObj {
   }
 
   void post() {
-    if (_thread->is_in_any_VTMS_transition()) {
-      return; // no events should be posted if thread is in any VTMS transition
-    }
     post_all_envs();
     copy_modified_data();
   }
@@ -1097,6 +1093,9 @@ bool JvmtiExport::post_class_file_load_hook(Symbol* h_name,
   if (JavaThread::current()->is_in_tmp_VTMS_transition()) {
     return false; // skip CFLH events in tmp VTMS transition
   }
+  if (JavaThread::current()->is_in_any_VTMS_transition()) {
+    return false; // no events should be posted if thread is in any VTMS transition
+  }
 
   JvmtiClassFileLoadHookPoster poster(h_name, class_loader,
                                       h_protection_domain,

diff --git a/...dTraceWithAgent/TestPinCaseWithTrace.java → ...tPinCaseWithCFLH/TestPinCaseWithCFLH.java b/...dTraceWithAgent/TestPinCaseWithTrace.java → ...tPinCaseWithCFLH/TestPinCaseWithCFLH.java
@@ -23,22 +23,22 @@
 
 /*
  * @test
- * @summary javaagent+tracePinnedThreads will cause jvm crash/ run into deadlock when the virtual thread is pinned
+ * @summary javaagent + tracePinnedThreads will cause jvm crash/ run into deadlock when the virtual thread is pinned
  * @library /test/lib
  * @requires os.family == "linux"
  * @requires os.arch != "riscv64"
  * @modules java.base/java.lang:+open
- * @build TestPinCaseWithTrace
+ * @build TestPinCaseWithCFLH
  * @run driver jdk.test.lib.util.JavaAgentBuilder
- *      TestPinCaseWithTrace TestPinCaseWithTrace.jar
- * @run main/othervm/timeout=100  -Djdk.virtualThreadScheduler.maxPoolSize=1 -Djdk.tracePinnedThreads=full -javaagent:TestPinCaseWithTrace.jar TestPinCaseWithTrace
+ *      TestPinCaseWithCFLH TestPinCaseWithCFLH.jar
+ * @run main/othervm/timeout=100  -Djdk.virtualThreadScheduler.maxPoolSize=1 -Djdk.tracePinnedThreads=full -javaagent:TestPinCaseWithCFLH.jar TestPinCaseWithCFLH
  */
 import java.lang.instrument.ClassFileTransformer;
 import java.lang.instrument.IllegalClassFormatException;
 import java.lang.instrument.Instrumentation;
 import java.security.ProtectionDomain;
 
-public class TestPinCaseWithTrace {
+public class TestPinCaseWithCFLH {
 
     public static class TestClassFileTransformer implements ClassFileTransformer {
         public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws IllegalClassFormatException {
@@ -51,16 +51,19 @@ public static void premain(String agentArgs, Instrumentation instrumentation) th
         instrumentation.addTransformer(new TestClassFileTransformer());
     }
 
+    private static int result = 0;
+
     public static void main(String[] args) throws Exception{
         Thread t1 = Thread.ofVirtual().name("vthread-1").start(() -> {
-            System.out.println("call native: " + nativeFuncPin(1));
+            result = nativeFuncPin(1);
         });
         t1.join();
+        assert result == 4;
     }
 
     static int native2Java(int b) {
         try {
-            Thread.sleep(500); // try yield, will pin, javaagent + tracePinnedThreads will crash here (because of the class `PinnedThreadPrinter`)
+            Thread.sleep(500); // try yield, will pin, javaagent + tracePinnedThreads should not lead to crash (because of the class `PinnedThreadPrinter`)
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -71,6 +74,6 @@ static int native2Java(int b) {
     private static native int nativeFuncPin(int x);
 
     static {
-        System.loadLibrary("PinJNI");
+        System.loadLibrary("TestPinCaseWithCFLH");
     }
 }
diff --git a/...vthread/VThreadTraceWithAgent/libPinJNI.c → ...inCaseWithCFLH/libTestPinCaseWithCFLH.cpp b/...vthread/VThreadTraceWithAgent/libPinJNI.c → ...inCaseWithCFLH/libTestPinCaseWithCFLH.cpp
@@ -21,11 +21,15 @@
  * questions.
  */
 
-#include "jni.h"
+#include <jni.h>
+
+extern "C" {
 
 JNIEXPORT jint JNICALL
-Java_TestPinCaseWithTrace_nativeFuncPin(JNIEnv* env, jclass klass, jint x) {
-    jmethodID m = (*env)->GetStaticMethodID(env, klass, "native2Java", "(I)I");
-    jint r = (*env)->CallStaticIntMethod(env, klass, m, x+1);
+Java_TestPinCaseWithCFLH_nativeFuncPin(JNIEnv* env, jclass klass, jint x) {
+    jmethodID m = env->GetStaticMethodID(klass, "native2Java", "(I)I");
+    jint r = env->CallStaticIntMethod(klass, m, x+1);
     return r + 1;
 }
+
+} // extern "C"