From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 27 Jun 2017 06:07:23 +0000 Subject: webkitgtk-2.16.5 --- Source/WTF/wtf/ParallelJobsGeneric.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Source/WTF/wtf/ParallelJobsGeneric.cpp') diff --git a/Source/WTF/wtf/ParallelJobsGeneric.cpp b/Source/WTF/wtf/ParallelJobsGeneric.cpp index 2cc0bc643..4023f43e6 100644 --- a/Source/WTF/wtf/ParallelJobsGeneric.cpp +++ b/Source/WTF/wtf/ParallelJobsGeneric.cpp @@ -105,17 +105,17 @@ bool ParallelEnvironment::ThreadPrivate::tryLockFor(ParallelEnvironment* parent) void ParallelEnvironment::ThreadPrivate::execute(ThreadFunction threadFunction, void* parameters) { - MutexLocker lock(m_mutex); + LockHolder lock(m_mutex); m_threadFunction = threadFunction; m_parameters = parameters; m_running = true; - m_threadCondition.signal(); + m_threadCondition.notifyOne(); } void ParallelEnvironment::ThreadPrivate::waitForFinish() { - MutexLocker lock(m_mutex); + LockHolder lock(m_mutex); while (m_running) m_threadCondition.wait(m_mutex); @@ -124,14 +124,14 @@ void ParallelEnvironment::ThreadPrivate::waitForFinish() void ParallelEnvironment::ThreadPrivate::workerThread(void* threadData) { ThreadPrivate* sharedThread = reinterpret_cast(threadData); - MutexLocker lock(sharedThread->m_mutex); + LockHolder lock(sharedThread->m_mutex); while (sharedThread->m_threadID) { if (sharedThread->m_running) { (*sharedThread->m_threadFunction)(sharedThread->m_parameters); sharedThread->m_running = false; sharedThread->m_parent = 0; - sharedThread->m_threadCondition.signal(); + sharedThread->m_threadCondition.notifyOne(); } sharedThread->m_threadCondition.wait(sharedThread->m_mutex); -- cgit v1.2.1