diff -r 73bec9f941d7 -r b7b2407bc7e5 hotspot/src/share/vm/runtime/synchronizer.cpp --- a/hotspot/src/share/vm/runtime/synchronizer.cpp Wed Sep 02 17:49:46 2015 -0700 +++ b/hotspot/src/share/vm/runtime/synchronizer.cpp Thu Sep 03 10:22:39 2015 -0700 @@ -189,9 +189,7 @@ mon->INotify(self); ++tally; } while (mon->first_waiter() != NULL && all); - if (ObjectMonitor::_sync_Notifications != NULL) { - ObjectMonitor::_sync_Notifications->inc(tally); - } + OM_PERFDATA_OP(Notifications, inc(tally)); } return true; } @@ -1413,7 +1411,7 @@ // Hopefully the performance counters are allocated on distinct cache lines // to avoid false sharing on MP systems ... - if (ObjectMonitor::_sync_Inflations != NULL) ObjectMonitor::_sync_Inflations->inc(); + OM_PERFDATA_OP(Inflations, inc()); TEVENT(Inflate: overwrite stacklock); if (TraceMonitorInflation) { if (object->is_instance()) { @@ -1461,7 +1459,7 @@ // Hopefully the performance counters are allocated on distinct // cache lines to avoid false sharing on MP systems ... - if (ObjectMonitor::_sync_Inflations != NULL) ObjectMonitor::_sync_Inflations->inc(); + OM_PERFDATA_OP(Inflations, inc()); TEVENT(Inflate: overwrite neutral); if (TraceMonitorInflation) { if (object->is_instance()) { @@ -1678,8 +1676,8 @@ } Thread::muxRelease(&gListLock); - if (ObjectMonitor::_sync_Deflations != NULL) ObjectMonitor::_sync_Deflations->inc(nScavenged); - if (ObjectMonitor::_sync_MonExtant != NULL) ObjectMonitor::_sync_MonExtant ->set_value(nInCirculation); + OM_PERFDATA_OP(Deflations, inc(nScavenged)); + OM_PERFDATA_OP(MonExtant, set_value(nInCirculation)); // TODO: Add objectMonitor leak detection. // Audit/inventory the objectMonitors -- make sure they're all accounted for.