| Index: runtime/vm/lockers.cc
|
| diff --git a/runtime/vm/lockers.cc b/runtime/vm/lockers.cc
|
| index 6b47e289625a596589591f9a2e0622322a571bbb..533e3597bdae0af69b1f693380c6d28003bf694e 100644
|
| --- a/runtime/vm/lockers.cc
|
| +++ b/runtime/vm/lockers.cc
|
| @@ -2,13 +2,12 @@
|
| // for details. All rights reserved. Use of this source code is governed by a
|
| // BSD-style license that can be found in the LICENSE file.
|
|
|
| -#include "platform/assert.h"
|
| #include "vm/lockers.h"
|
| +#include "platform/assert.h"
|
| #include "vm/safepoint.h"
|
|
|
| namespace dart {
|
|
|
| -
|
| static void updateThreadState(Thread* thread) {
|
| // First try a fast update of the thread state to indicate it is not at a
|
| // safepoint anymore.
|
| @@ -25,7 +24,6 @@ static void updateThreadState(Thread* thread) {
|
| thread->set_execution_state(Thread::kThreadInVM);
|
| }
|
|
|
| -
|
| Monitor::WaitResult MonitorLocker::WaitWithSafepointCheck(Thread* thread,
|
| int64_t millis) {
|
| ASSERT(thread == Thread::Current());
|
| @@ -51,7 +49,6 @@ Monitor::WaitResult MonitorLocker::WaitWithSafepointCheck(Thread* thread,
|
| return result;
|
| }
|
|
|
| -
|
| SafepointMutexLocker::SafepointMutexLocker(Mutex* mutex) : mutex_(mutex) {
|
| ASSERT(mutex != NULL);
|
| if (!mutex_->TryLock()) {
|
| @@ -70,7 +67,6 @@ SafepointMutexLocker::SafepointMutexLocker(Mutex* mutex) : mutex_(mutex) {
|
| }
|
| }
|
|
|
| -
|
| SafepointMonitorLocker::SafepointMonitorLocker(Monitor* monitor)
|
| : monitor_(monitor) {
|
| ASSERT(monitor_ != NULL);
|
| @@ -90,7 +86,6 @@ SafepointMonitorLocker::SafepointMonitorLocker(Monitor* monitor)
|
| }
|
| }
|
|
|
| -
|
| Monitor::WaitResult SafepointMonitorLocker::Wait(int64_t millis) {
|
| Thread* thread = Thread::Current();
|
| if (thread != NULL) {
|
|
|