Changeset 187026 in webkit

Timestamp:

Jul 20, 2015 11:12:56 AM (9 years ago)

Author:

mark.lam@apple.com

Message:

Rollout r187020 and r187021: breaks JSC API tests on debug builds.
​https://bugs.webkit.org/show_bug.cgi?id=147110

Source/JavaScriptCore:

• heap/MachineStackMarker.cpp:

(JSC::MachineThreads::addCurrentThread):

• runtime/JSLock.cpp:

(JSC::JSLockHolder::~JSLockHolder):
(JSC::JSLock::JSLock):
(JSC::JSLock::willDestroyVM):
(JSC::JSLock::setExclusiveThread):
(JSC::JSLock::lock):
(JSC::JSLock::unlock):
(JSC::JSLock::currentThreadIsHoldingLock):
(JSC::JSLock::dropAllLocks):

• runtime/JSLock.h:

(JSC::JSLock::vm):
(JSC::JSLock::hasExclusiveThread):
(JSC::JSLock::exclusiveThread):

• runtime/VM.h:

(JSC::VM::hasExclusiveThread):
(JSC::VM::exclusiveThread):
(JSC::VM::setExclusiveThread):

Source/WebCore:

• bindings/js/JSDOMWindowBase.cpp:

(WebCore::JSDOMWindowBase::commonVM):

Source/WTF:

• wtf/WTFThreadData.cpp:

(WTF::WTFThreadData::WTFThreadData):

• wtf/WTFThreadData.h:

(WTF::WTFThreadData::stack):

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/heap/MachineStackMarker.cpp (modified) (1 diff)
• JavaScriptCore/runtime/JSLock.cpp (modified) (7 diffs)
• JavaScriptCore/runtime/JSLock.h (modified) (3 diffs)
• JavaScriptCore/runtime/VM.h (modified) (1 diff)
• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/WTFThreadData.cpp (modified) (1 diff)
• WTF/wtf/WTFThreadData.h (modified) (2 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/js/JSDOMWindowBase.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-07-20  Mark Lam  <mark.lam@apple.com>
+
+        Rollout r187020 and r187021: breaks JSC API tests on debug builds.
+        https://bugs.webkit.org/show_bug.cgi?id=147110
+
+        * heap/MachineStackMarker.cpp:
+        (JSC::MachineThreads::addCurrentThread):
+        * runtime/JSLock.cpp:
+        (JSC::JSLockHolder::~JSLockHolder):
+        (JSC::JSLock::JSLock):
+        (JSC::JSLock::willDestroyVM):
+        (JSC::JSLock::setExclusiveThread):
+        (JSC::JSLock::lock):
+        (JSC::JSLock::unlock):
+        (JSC::JSLock::currentThreadIsHoldingLock):
+        (JSC::JSLock::dropAllLocks):
+        * runtime/JSLock.h:
+        (JSC::JSLock::vm):
+        (JSC::JSLock::hasExclusiveThread):
+        (JSC::JSLock::exclusiveThread):
+        * runtime/VM.h:
+        (JSC::VM::hasExclusiveThread):
+        (JSC::VM::exclusiveThread):
+        (JSC::VM::setExclusiveThread):
+
 2015-07-20  Per Arne Vollan  <peavo@outlook.com>
 

trunk/Source/JavaScriptCore/heap/MachineStackMarker.cpp

@@ -285 +285 @@
 void MachineThreads::addCurrentThread()
 {
-    ASSERT(!m_heap->vm()->hasExclusiveThread() || m_heap->vm()->exclusiveThread() == currentThread());
+    ASSERT(!m_heap->vm()->hasExclusiveThread() || m_heap->vm()->exclusiveThread() == std::this_thread::get_id());
 
     if (threadSpecificGet(m_threadSpecific)) {

trunk/Source/JavaScriptCore/runtime/JSLock.cpp

@@ -27 +27 @@
 #include "JSObject.h"
 #include "JSCInlines.h"
+#include <thread>
 
 namespace JSC {
@@ -78 +79 @@
 
 JSLock::JSLock(VM* vm)
-    : m_ownerThreadID(0)
+    : m_ownerThreadID(std::thread::id())
     , m_lockCount(0)
     , m_lockDropDepth(0)
@@ -97 +98 @@
 }
 
-void JSLock::setExclusiveThread(ThreadIdentifier threadId)
-{
-    RELEASE_ASSERT(!m_lockCount && !m_ownerThreadID);
-    m_hasExclusiveThread = !!threadId;
+void JSLock::setExclusiveThread(std::thread::id threadId)
+{
+    RELEASE_ASSERT(!m_lockCount && m_ownerThreadID == std::thread::id());
+    m_hasExclusiveThread = (threadId != std::thread::id());
     m_ownerThreadID = threadId;
 }
@@ -119 +120 @@
     if (!m_hasExclusiveThread) {
         m_lock.lock();
-        m_ownerThreadID = currentThread();
+        m_ownerThreadID = std::this_thread::get_id();
     }
     ASSERT(!m_lockCount);
@@ -167 +168 @@
 
         if (!m_hasExclusiveThread) {
-            m_ownerThreadID = 0;
+            m_ownerThreadID = std::thread::id();
             m_lock.unlock();
         }
@@ -200 +201 @@
 bool JSLock::currentThreadIsHoldingLock()
 {
-    ASSERT(!m_hasExclusiveThread || (exclusiveThread() == currentThread()));
+    ASSERT(!m_hasExclusiveThread || (exclusiveThread() == std::this_thread::get_id()));
     if (m_hasExclusiveThread)
         return !!m_lockCount;
-    return m_ownerThreadID == currentThread();
+    return m_ownerThreadID == std::this_thread::get_id();
 }
 
@@ -210 +211 @@
 {
     if (m_hasExclusiveThread) {
-        ASSERT(exclusiveThread() == currentThread());
+        ASSERT(exclusiveThread() == std::this_thread::get_id());
         return 0;
     }

trunk/Source/JavaScriptCore/runtime/JSLock.h

@@ -23 +23 @@
 
 #include <mutex>
+#include <thread>
 #include <wtf/Assertions.h>
 #include <wtf/Noncopyable.h>
 #include <wtf/RefPtr.h>
 #include <wtf/ThreadSafeRefCounted.h>
-#include <wtf/Threading.h>
 #include <wtf/WTFThreadData.h>
 
@@ -97 +97 @@
 
     bool hasExclusiveThread() const { return m_hasExclusiveThread; }
-    ThreadIdentifier exclusiveThread() const
+    std::thread::id exclusiveThread() const
     {
         ASSERT(m_hasExclusiveThread);
         return m_ownerThreadID;
     }
-    JS_EXPORT_PRIVATE void setExclusiveThread(ThreadIdentifier);
+    JS_EXPORT_PRIVATE void setExclusiveThread(std::thread::id);
     JS_EXPORT_PRIVATE bool currentThreadIsHoldingLock();
 
@@ -135 +135 @@
 
     std::mutex m_lock;
-    ThreadIdentifier m_ownerThreadID;
+    std::thread::id m_ownerThreadID;
     intptr_t m_lockCount;
     unsigned m_lockDropDepth;

trunk/Source/JavaScriptCore/runtime/VM.h

@@ -500 +500 @@
 
     bool hasExclusiveThread() const { return m_apiLock->hasExclusiveThread(); }
-    ThreadIdentifier exclusiveThread() const { return m_apiLock->exclusiveThread(); }
-    void setExclusiveThread(ThreadIdentifier threadId) { m_apiLock->setExclusiveThread(threadId); }
+    std::thread::id exclusiveThread() const { return m_apiLock->exclusiveThread(); }
+    void setExclusiveThread(std::thread::id threadId) { m_apiLock->setExclusiveThread(threadId); }
 
     JS_EXPORT_PRIVATE void resetDateCache();

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2015-07-20  Mark Lam  <mark.lam@apple.com>
+
+        Rollout r187020 and r187021: breaks JSC API tests on debug builds.
+        https://bugs.webkit.org/show_bug.cgi?id=147110
+
+        * wtf/WTFThreadData.cpp:
+        (WTF::WTFThreadData::WTFThreadData):
+        * wtf/WTFThreadData.h:
+        (WTF::WTFThreadData::stack):
+
 2015-07-20  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WTF/wtf/WTFThreadData.cpp

@@ -51 +51 @@
     , m_savedStackPointerAtVMEntry(0)
     , m_savedLastStackTop(stack().origin())
-#if OS(WINDOWS)
-    , m_lastFiber(nullptr)
-#endif
 {
     AtomicStringTable::create(*this);

trunk/Source/WTF/wtf/WTFThreadData.h

@@ -84 +84 @@
         // See https://bugs.webkit.org/show_bug.cgi?id=102411
 #if OS(WINDOWS)
-        void* currentFiber = GetCurrentFiber();
-        if (currentFiber != m_lastFiber) {
-            m_stackBounds = StackBounds::currentThreadStackBounds();
-            m_lastFiber = currentFiber;
-        }
+        m_stackBounds = StackBounds::currentThreadStackBounds();
 #endif
         return m_stackBounds;
@@ -133 +129 @@
     void* m_savedStackPointerAtVMEntry;
     void* m_savedLastStackTop;
-#if OS(WINDOWS)
-    void* m_lastFiber;
-#endif
 
 #if USE(PTHREAD_GETSPECIFIC_DIRECT)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-07-20  Mark Lam  <mark.lam@apple.com>
+
+        Rollout r187020 and r187021: breaks JSC API tests on debug builds.
+        https://bugs.webkit.org/show_bug.cgi?id=147110
+
+        * bindings/js/JSDOMWindowBase.cpp:
+        (WebCore::JSDOMWindowBase::commonVM):
+
 2015-07-18  Ada Chan  <adachan@apple.com>
 

trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp

@@ -204 +204 @@
         vm = &VM::createLeaked(LargeHeap).leakRef();
 #if !PLATFORM(IOS)
-        vm->setExclusiveThread(currentThread());
+        vm->setExclusiveThread(std::this_thread::get_id());
 #else
         vm->heap.setFullActivityCallback(WebSafeFullGCActivityCallback::create(&vm->heap));