Merge branch 'fibers' of github:openjdk/loom into fibers

Author: coleenp

src/hotspot/share/prims/jvmtiThreadState.cpp

@@ -247,27 +247,27 @@ JvmtiVTMTDisabler::~JvmtiVTMTDisabler() {
 void
 JvmtiVTMTDisabler::disable_VTMT() {
   JavaThread* thread = JavaThread::current();
-  int attempts = 10;
+  int attempts = 1000;
   {
     ThreadBlockInVM tbivm(thread);
     MonitorLocker ml(JvmtiVTMT_lock, Mutex::_no_safepoint_check_flag);
 
     assert(!thread->is_in_VTMT(), "VTMT sanity check");
     while (_SR_mode) { // suspender or resumer is a JvmtiVTMTDisabler monopolist
-      ml.wait(1000); // wait while there is an active suspender or resumer
+      ml.wait(10); // wait while there is an active suspender or resumer
     }
     if (_is_SR) {
       _SR_mode = true;
       while (_VTMT_disable_count > 0) {
-        ml.wait(1000); // wait while there is any active jvmtiVTMTDisabler
+        ml.wait(10); // wait while there is any active jvmtiVTMTDisabler
       }
     }
     Atomic::inc(&_VTMT_disable_count);
 
     // Block while some mount/unmount transitions are in progress.
     // Debug version fails and print diagnostic information
     while (_VTMT_count > 0) {
-      if (ml.wait(1000)) {
+      if (ml.wait(10)) {
         attempts--;
       }
       DEBUG_ONLY(if (attempts == 0) break;)
@@ -308,7 +308,7 @@ JvmtiVTMTDisabler::start_VTMT(jthread vthread, int callsite_tag) {
   JavaThread* thread = JavaThread::current();
   HandleMark hm(thread);
   Handle vth = Handle(thread, JNIHandles::resolve_external_guard(vthread));
-  int attempts = 10 * 100;
+  int attempts = 1000;
 
   // Avoid using MonitorLocker on performance critical path, use
   // two-level synchronization with lock-free operations on counters.

test/hotspot/jtreg/ProblemList-vthread.txt

@@ -2,6 +2,7 @@
 
 vmTestbase/nsk/stress/jni/gclocker/gcl001.java                                                  8278569 generic-all
 
+
 ##########
 ## Tests failing when main() is executed in additional kernel or virtual thread
 

test/hotspot/jtreg/serviceability/jvmti/GetLocalVariable/libGetLocalWithoutSuspendTest.cpp

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 SAP SE. All rights reserved.
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -328,7 +329,7 @@ void JNICALL VMInit(jvmtiEnv *jvmti, JNIEnv *env, jthread thr) {
   jvmtiError err;
   jobject agent_thread_name;
   jclass thread_clas;
-  jmethodID thread_ctro;
+  jmethodID thread_ctor;
   jthread agent_thread;
 
   printf("AGENT: VM init event\n");
@@ -340,16 +341,16 @@ void JNICALL VMInit(jvmtiEnv *jvmti, JNIEnv *env, jthread thr) {
   }
 
   thread_clas = env->FindClass("java/lang/Thread");
-  if (agent_thread_name == NULL) {
+  if (thread_clas == NULL) {
     env->FatalError("VMInit: java.lang.Thread class not found\n");
   }
 
-  thread_ctro = env->GetMethodID(thread_clas, "<init>", "(Ljava/lang/String;)V");
-  if (thread_ctro == NULL) {
+  thread_ctor = env->GetMethodID(thread_clas, "<init>", "(Ljava/lang/String;)V");
+  if (thread_ctor == NULL) {
     env->FatalError("VMInit: failed to get ID for the Thread ctor\n");
   }
 
-  agent_thread = (jthread) env->NewObject(thread_clas, thread_ctro, agent_thread_name);
+  agent_thread = (jthread) env->NewObject(thread_clas, thread_ctor, agent_thread_name);
   if (agent_thread == NULL) {
     env->FatalError("VMInit: Failed to allocate thread object\n");
   }