backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-02-13 15:15:21 +08:00
Code Issues Projects Releases Wiki Activity

issue #4072 Carbon loop not ready within 5 sec

Browse Source 
added lock to all condVar
This commit is contained in:
jerry
2014-06-02 16:07:58 +00:00
parent 9feaa959f1
commit 507abdcbfb
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/lib/platform/OSXScreen.cpp
View File

@@ -1701,9 +1701,12 @@ COSXScreen::watchSystemPowerThread(void*)
m_events->waitForReady();
#if defined(MAC_OS_X_VERSION_10_7)
if (*m_carbonLoopReady == false) {
*m_carbonLoopReady = true;
m_carbonLoopReady->signal();
{
CLock lockCarbon(m_carbonLoopMutex);
if (*m_carbonLoopReady == false) {
*m_carbonLoopReady = true;
m_carbonLoopReady->signal();
}
}
#endif
@@ -2123,16 +2126,13 @@ void
COSXScreen::waitForCarbonLoop() const
{
#if defined(MAC_OS_X_VERSION_10_7)
double timeout = ARCH->time() + 5;
m_carbonLoopReady->lock();
double timeout = ARCH->time() + 10;
CLock lock(m_carbonLoopMutex);
while (!m_carbonLoopReady->wait()) {
if(ARCH->time() > timeout) {
throw std::runtime_error("carbon loop is not ready within 5 sec");
}
}
m_carbonLoopReady->unlock();
#endif
}