summaryrefslogtreecommitdiffstats
path: root/lldb/source/Host/common/Condition.cpp
diff options
context:
space:
mode:
authorJim Ingham <jingham@apple.com>2012-05-04 23:02:50 +0000
committerJim Ingham <jingham@apple.com>2012-05-04 23:02:50 +0000
commit10ebffa48a592e2e03b2e8478b03ccdd0e8da2d5 (patch)
tree32f9eceb84a66b9b7f0387d5b89ba089d5bb4fe1 /lldb/source/Host/common/Condition.cpp
parente326ed33a8135dca882a76128840a28c38a1e106 (diff)
downloadbcm5719-llvm-10ebffa48a592e2e03b2e8478b03ccdd0e8da2d5.tar.gz
bcm5719-llvm-10ebffa48a592e2e03b2e8478b03ccdd0e8da2d5.zip
Don't expose the pthread_mutex_t underlying the Mutex & Mutex::Locker classes.
No one was using it and Locker(pthread_mutex_t *) immediately asserts for pthread_mutex_t's that don't come from a Mutex anyway. Rather than try to make that work, we should maintain the Mutex abstraction and not pass around the platform implementation... Make Mutex::Locker::Lock take a Mutex & or a Mutex *, and remove the constructor taking a pthread_mutex_t *. You no longer need to call Mutex::GetMutex to pass your mutex to a Locker (you can't in fact, since I made it private.) llvm-svn: 156221
Diffstat (limited to 'lldb/source/Host/common/Condition.cpp')
-rw-r--r--lldb/source/Host/common/Condition.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/lldb/source/Host/common/Condition.cpp b/lldb/source/Host/common/Condition.cpp
index 535afcb0439..daa729cadca 100644
--- a/lldb/source/Host/common/Condition.cpp
+++ b/lldb/source/Host/common/Condition.cpp
@@ -78,7 +78,7 @@ Condition::Signal ()
// The current thread re-acquires the lock on "mutex".
//----------------------------------------------------------------------
int
-Condition::Wait (pthread_mutex_t *mutex, const TimeValue *abstime, bool *timed_out)
+Condition::Wait (Mutex &mutex, const TimeValue *abstime, bool *timed_out)
{
int err = 0;
do
@@ -86,10 +86,10 @@ Condition::Wait (pthread_mutex_t *mutex, const TimeValue *abstime, bool *timed_o
if (abstime && abstime->IsValid())
{
struct timespec abstime_ts = abstime->GetAsTimeSpec();
- err = ::pthread_cond_timedwait (&m_condition, mutex, &abstime_ts);
+ err = ::pthread_cond_timedwait (&m_condition, mutex.GetMutex(), &abstime_ts);
}
else
- err = ::pthread_cond_wait (&m_condition, mutex);
+ err = ::pthread_cond_wait (&m_condition, mutex.GetMutex());
} while (err == EINTR);
if (timed_out != NULL)
OpenPOWER on IntegriCloud