Index: runtime/vm/thread_macos.cc |
diff --git a/runtime/vm/thread_macos.cc b/runtime/vm/thread_macos.cc |
index 4137df45d53523fec89c7babe7e0afb92107408e..a86bd73b1706c485eff740fb75ac46ef8fa0f62d 100644 |
--- a/runtime/vm/thread_macos.cc |
+++ b/runtime/vm/thread_macos.cc |
@@ -86,143 +86,4 @@ Thread::Thread(ThreadStartFunction function, uword parameter) { |
Thread::~Thread() { |
} |
- |
-Mutex::Mutex() { |
- pthread_mutexattr_t attr; |
- int result = pthread_mutexattr_init(&attr); |
- VALIDATE_PTHREAD_RESULT(result); |
- |
-#if defined(DEBUG) |
- result = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK); |
- VALIDATE_PTHREAD_RESULT(result); |
-#endif // defined(DEBUG) |
- |
- result = pthread_mutex_init(data_.mutex(), &attr); |
- // Verify that creating a pthread_mutex succeeded. |
- VALIDATE_PTHREAD_RESULT(result); |
- |
- result = pthread_mutexattr_destroy(&attr); |
- VALIDATE_PTHREAD_RESULT(result); |
-} |
- |
- |
-Mutex::~Mutex() { |
- int result = pthread_mutex_destroy(data_.mutex()); |
- // Verify that the pthread_mutex was destroyed. |
- VALIDATE_PTHREAD_RESULT(result); |
-} |
- |
- |
-void Mutex::Lock() { |
- int result = pthread_mutex_lock(data_.mutex()); |
- // Specifically check for dead lock to help debugging. |
- ASSERT(result != EDEADLK); |
- ASSERT(result == 0); // Verify no other errors. |
- // TODO(iposva): Do we need to track lock owners? |
-} |
- |
- |
-bool Mutex::TryLock() { |
- int result = pthread_mutex_trylock(data_.mutex()); |
- // Return false if the lock is busy and locking failed. |
- if ((result == EBUSY) || (result == EDEADLK)) { |
- return false; |
- } |
- ASSERT(result == 0); // Verify no other errors. |
- // TODO(iposva): Do we need to track lock owners? |
- return true; |
-} |
- |
- |
-void Mutex::Unlock() { |
- // TODO(iposva): Do we need to track lock owners? |
- int result = pthread_mutex_unlock(data_.mutex()); |
- // Specifically check for wrong thread unlocking to aid debugging. |
- ASSERT(result != EPERM); |
- ASSERT(result == 0); // Verify no other errors. |
-} |
- |
- |
-Monitor::Monitor() { |
- pthread_mutexattr_t attr; |
- int result = pthread_mutexattr_init(&attr); |
- VALIDATE_PTHREAD_RESULT(result); |
- |
-#if defined(DEBUG) |
- result = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK); |
- VALIDATE_PTHREAD_RESULT(result); |
-#endif // defined(DEBUG) |
- |
- result = pthread_mutex_init(data_.mutex(), &attr); |
- VALIDATE_PTHREAD_RESULT(result); |
- |
- result = pthread_mutexattr_destroy(&attr); |
- VALIDATE_PTHREAD_RESULT(result); |
- |
- result = pthread_cond_init(data_.cond(), NULL); |
- VALIDATE_PTHREAD_RESULT(result); |
-} |
- |
- |
-Monitor::~Monitor() { |
- int result = pthread_mutex_destroy(data_.mutex()); |
- VALIDATE_PTHREAD_RESULT(result); |
- |
- result = pthread_cond_destroy(data_.cond()); |
- VALIDATE_PTHREAD_RESULT(result); |
-} |
- |
- |
-void Monitor::Enter() { |
- int result = pthread_mutex_lock(data_.mutex()); |
- VALIDATE_PTHREAD_RESULT(result); |
- // TODO(iposva): Do we need to track lock owners? |
-} |
- |
- |
-void Monitor::Exit() { |
- // TODO(iposva): Do we need to track lock owners? |
- int result = pthread_mutex_unlock(data_.mutex()); |
- VALIDATE_PTHREAD_RESULT(result); |
-} |
- |
- |
-Monitor::WaitResult Monitor::Wait(int64_t millis) { |
- // TODO(iposva): Do we need to track lock owners? |
- Monitor::WaitResult retval = kNotified; |
- if (millis == 0) { |
- // Wait forever. |
- int result = pthread_cond_wait(data_.cond(), data_.mutex()); |
- VALIDATE_PTHREAD_RESULT(result); |
- } else { |
- struct timespec ts; |
- int64_t secs = millis / 1000; |
- int64_t nanos = (millis - (secs * 1000)) * 1000000; |
- ts.tv_sec = secs; |
- ts.tv_nsec = nanos; |
- int result = pthread_cond_timedwait_relative_np(data_.cond(), |
- data_.mutex(), |
- &ts); |
- ASSERT((result == 0) || (result == ETIMEDOUT)); |
- if (result == ETIMEDOUT) { |
- retval = kTimedOut; |
- } |
- } |
- return retval; |
-} |
- |
- |
-void Monitor::Notify() { |
- // TODO(iposva): Do we need to track lock owners? |
- int result = pthread_cond_signal(data_.cond()); |
- VALIDATE_PTHREAD_RESULT(result); |
-} |
- |
- |
-void Monitor::NotifyAll() { |
- // TODO(iposva): Do we need to track lock owners? |
- int result = pthread_cond_broadcast(data_.cond()); |
- VALIDATE_PTHREAD_RESULT(result); |
-} |
- |
} // namespace dart |