Changeset 213231 in webkit for trunk/Source/JavaScriptCore/runtime/JSLock.h

Timestamp:

Mar 1, 2017, 10:51:02 AM (8 years ago)

Author:

[email protected]

Message:

REGRESSION (r213202?): Assertion failed: (!"initialized()"), function operator().
​https://bugs.webkit.org/show_bug.cgi?id=169042

Not reviewed.

Rolling out r213229 and r213202.

• JavaScriptCore.xcodeproj/project.pbxproj:
• heap/MachineStackMarker.cpp:

(JSC::getCurrentPlatformThread):
(JSC::MachineThreads::Thread::createForCurrentThread):
(JSC::MachineThreads::machineThreadForCurrentThread):
(JSC::MachineThreads::removeThread):
(JSC::MachineThreads::Thread::suspend):
(JSC::MachineThreads::tryCopyOtherThreadStacks):

• heap/MachineStackMarker.h:
• runtime/JSCellInlines.h:

(JSC::JSCell::classInfo):

• runtime/JSLock.cpp:

(JSC::JSLock::JSLock):
(JSC::JSLock::lock):
(JSC::JSLock::unlock):
(JSC::JSLock::currentThreadIsHoldingLock):

• runtime/JSLock.h:

(JSC::JSLock::ownerThread):
(JSC::JSLock::currentThreadIsHoldingLock): Deleted.

• runtime/PlatformThread.h: Removed.
• runtime/VM.cpp:

(JSC::VM::~VM):

• runtime/VM.h:

(JSC::VM::ownerThread):

• runtime/Watchdog.cpp:

(JSC::Watchdog::setTimeLimit):
(JSC::Watchdog::shouldTerminate):
(JSC::Watchdog::startTimer):
(JSC::Watchdog::stopTimer):

• tools/JSDollarVMPrototype.cpp:

(JSC::JSDollarVMPrototype::currentThreadOwnsJSLock):

• tools/VMInspector.cpp:

File:

• trunk/Source/JavaScriptCore/runtime/JSLock.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/runtime/JSLock.h

@@ -21 +21 @@
 #pragma once
 
-#include "PlatformThread.h"
 #include <mutex>
+#include <thread>
 #include <wtf/Assertions.h>
 #include <wtf/Lock.h>
@@ -94 +94 @@
     VM* vm() { return m_vm; }
 
-    std::optional<PlatformThread> ownerThread() const { return m_ownerThread; }
-    bool currentThreadIsHoldingLock() { return m_ownerThread && m_ownerThread == currentPlatformThread(); }
+    std::thread::id ownerThread() const { return m_ownerThreadID; }
+    JS_EXPORT_PRIVATE bool currentThreadIsHoldingLock();
 
     void willDestroyVM(VM*);
@@ -127 +127 @@
 
     Lock m_lock;
-    std::optional<PlatformThread> m_ownerThread;
+    std::thread::id m_ownerThreadID;
     intptr_t m_lockCount;
     unsigned m_lockDropDepth;