jdk-sandbox: comparison src/hotspot/share/gc/shared/workgroup.cpp

equal deleted inserted replaced

-:8d52b4c6f9d8
+:05aaccf7d558
 ~MutexGangTaskDispatcher() {
 delete _monitor;
 }
 void coordinator_execute_on_workers(AbstractGangTask* task, uint num_workers) {
-MutexLocker ml(_monitor, Mutex::_no_safepoint_check_flag);
+MonitorLocker ml(_monitor, Mutex::_no_safepoint_check_flag);
 _task        = task;
 _num_workers = num_workers;
 // Tell the workers to get to work.
 _monitor->notify_all();
 // Wait for them to finish.
 while (_finished < _num_workers) {
-_monitor->wait_without_safepoint_check();
+ml.wait();
 }
 _task        = NULL;
 _num_workers = 0;
 _started     = 0;
 _should_reset = false;
 _aborted      = false;
 }
 bool WorkGangBarrierSync::enter() {
-MutexLocker x(monitor(), Mutex::_no_safepoint_check_flag);
+MonitorLocker ml(monitor(), Mutex::_no_safepoint_check_flag);
 if (should_reset()) {
 // The should_reset() was set and we are the first worker to enter
 // the sync barrier. We will zero the n_completed() count which
 // effectively resets the barrier.
 zero_completed();
 // will get stuck (as they will wake up, see that n_completed() !=
 // n_workers() and go back to sleep). Instead, we raise the
 // should_reset() flag and the barrier will be reset the first
 // time a worker enters it again.
 set_should_reset(true);
-monitor()->notify_all();
+ml.notify_all();
 } else {
 while (n_completed() != n_workers() && !aborted()) {
-monitor()->wait_without_safepoint_check();
+ml.wait();
 }
 }
 return !aborted();
 }