Changeset 188475 in webkit for trunk/Source/JavaScriptCore/disassembler/Disassembler.cpp

Timestamp:

Aug 14, 2015, 9:53:37 AM (10 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r188444.
​https://bugs.webkit.org/show_bug.cgi?id=148029

Broke GTK and EFL (see bug #148027) (Requested by philn on
#webkit).

Reverted changeset:

"Use WTF::Lock and WTF::Condition instead of WTF::Mutex,
WTF::ThreadCondition, std::mutex, and std::condition_variable"
​https://bugs.webkit.org/show_bug.cgi?id=147999
​http://trac.webkit.org/changeset/188444

File:

• trunk/Source/JavaScriptCore/disassembler/Disassembler.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/disassembler/Disassembler.cpp

@@ -28 +28 @@
 
 #include "MacroAssemblerCodeRef.h"
-#include <wtf/Condition.h>
 #include <wtf/DataLog.h>
 #include <wtf/Deque.h>
-#include <wtf/Lock.h>
 #include <wtf/NeverDestroyed.h>
 #include <wtf/StringPrintStream.h>
 #include <wtf/Threading.h>
+#include <wtf/ThreadingPrimitives.h>
 
 namespace JSC {
@@ -80 +79 @@
     void enqueue(std::unique_ptr<DisassemblyTask> task)
     {
-        LockHolder locker(m_lock);
+        MutexLocker locker(m_lock);
         m_queue.append(WTF::move(task));
-        m_condition.notifyAll();
+        m_condition.broadcast();
     }
     
     void waitUntilEmpty()
     {
-        LockHolder locker(m_lock);
+        MutexLocker locker(m_lock);
         while (!m_queue.isEmpty() || m_working)
             m_condition.wait(m_lock);
@@ -98 +97 @@
             std::unique_ptr<DisassemblyTask> task;
             {
-                LockHolder locker(m_lock);
+                MutexLocker locker(m_lock);
                 m_working = false;
-                m_condition.notifyAll();
+                m_condition.broadcast();
                 while (m_queue.isEmpty())
                     m_condition.wait(m_lock);
@@ -114 +113 @@
     }
     
-    Lock m_lock;
-    Condition m_condition;
+    Mutex m_lock;
+    ThreadCondition m_condition;
     Deque<std::unique_ptr<DisassemblyTask>> m_queue;
     bool m_working { false };