src/hotspot/share/runtime/synchronizer.cpp

rev 56967 : [mq]: 8234086-v2
rev 56968 : imported patch 8234086-v4

@@ -527,12 +527,11 @@
   volatile int hc_sequence;
   DEFINE_PAD_MINUS_SIZE(2, DEFAULT_CACHE_LINE_SIZE, sizeof(volatile int));
 };
 
 static SharedGlobals GVars;
-static int MonitorScavengeThreshold = 1000000;
-static volatile int ForceMonitorScavenge = 0; // Scavenge required and pending
+static int _forceMonitorScavenge = 0; // Scavenge required and pending
 
 static markWord read_stable_mark(oop obj) {
   markWord mark = obj->mark();
   if (!mark.is_being_inflated()) {
     return mark;       // normal fast-path return

@@ -916,11 +915,11 @@
   }
   return needs_monitor_scavenge();
 }
 
 bool ObjectSynchronizer::needs_monitor_scavenge() {
-  if (Atomic::load(&ForceMonitorScavenge) == 1) {
+  if (Atomic::load(&_forceMonitorScavenge) == 1) {
     log_info(monitorinflation)("Monitor scavenge needed, triggering safepoint cleanup.");
     return true;
   }
   return false;
 }

@@ -999,11 +998,11 @@
   // Ultimately, this results in a call to deflate_idle_monitors() in the near future.
   // More precisely, trigger a cleanup safepoint as the number
   // of active monitors passes the specified threshold.
   // TODO: assert thread state is reasonable
 
-  if (Atomic::load(&ForceMonitorScavenge) == 0 && Atomic::xchg (1, &ForceMonitorScavenge) == 0) {
+  if (Atomic::load(&_forceMonitorScavenge) == 0 && Atomic::xchg (1, &_forceMonitorScavenge) == 0) {
     VMThread::check_cleanup();
   }
 }
 
 ObjectMonitor* ObjectSynchronizer::om_alloc(Thread* self) {

@@ -1678,11 +1677,11 @@
                                "g_om_free_count=%d", g_om_population,
                                g_om_in_use_count, g_om_free_count);
     Thread::muxRelease(&gListLock);
   }
 
-  Atomic::store(0, &ForceMonitorScavenge);    // Reset
+  Atomic::store(0, &_forceMonitorScavenge);    // Reset
 
   OM_PERFDATA_OP(Deflations, inc(counters->n_scavenged));
   OM_PERFDATA_OP(MonExtant, set_value(counters->n_in_circulation));
 
   GVars.stw_random = os::random();