< prev index next >

src/hotspot/share/runtime/thread.cpp

Print this page
rev 54932 : 8221086: Shenandoah-specific workaround for JDK-8220671

@@ -1309,26 +1309,39 @@
     }
   }
 }
 
 void NonJavaThread::pre_run() {
-  // Initialize BarrierSet-related data before adding to list.
+  {
+    BarrierSet* bs = BarrierSet::barrier_set();
   assert(BarrierSet::barrier_set() != NULL, "invariant");
-  BarrierSet::barrier_set()->on_thread_attach(this);
+    SuspendibleThreadSetJoiner sts(bs->needs_sts_sync_on_attach_detach() &&
+                                   !is_VM_thread() && !is_Worker_thread());
   add_to_the_list();
 
+    // Initialize BarrierSet-related data after adding to list.
+    bs->on_thread_attach(this);
+  }
+
   // This is slightly odd in that NamedThread is a subclass, but
   // in fact name() is defined in Thread
   assert(this->name() != NULL, "thread name was not set before it was started");
   this->set_native_thread_name(this->name());
 }
 
 void NonJavaThread::post_run() {
   JFR_ONLY(Jfr::on_thread_exit(this);)
+  {
+    BarrierSet* bs = BarrierSet::barrier_set();
+    SuspendibleThreadSetJoiner sts(bs->needs_sts_sync_on_attach_detach() &&
+                                   !is_VM_thread() && !is_Worker_thread());
+
   // Clean up BarrierSet data before removing from list.
-  BarrierSet::barrier_set()->on_thread_detach(this);
+    bs->on_thread_detach(this);
+
   remove_from_the_list();
+  }
   // Ensure thread-local-storage is cleared before termination.
   Thread::clear_thread_current();
 }
 
 // NamedThread --  non-JavaThread subclasses with multiple
< prev index next >