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

Timestamp:

Mar 28, 2017, 1:08:49 PM (8 years ago)

Author:

Yusuke Suzuki

Message:

[JSC] Move platformThreadSignal to WTF
​https://bugs.webkit.org/show_bug.cgi?id=170097

Reviewed by Mark Lam.

Source/JavaScriptCore:

It is a small clean up towards ​https://bugs.webkit.org/show_bug.cgi?id=170027.
platformThreadSignal uses PlatformThread in JSC, but it can be implemented in
WTF ThreadIdentifier.

• runtime/JSLock.cpp:

(JSC::JSLock::lock):

• runtime/JSLock.h:

(JSC::JSLock::ownerThread):
(JSC::JSLock::currentThreadIsHoldingLock):

• runtime/PlatformThread.h:

(JSC::platformThreadSignal): Deleted.

• runtime/VM.h:

(JSC::VM::ownerThread):

• runtime/VMTraps.cpp:

(JSC::VMTraps::SignalSender::send):

Source/WTF:

• wtf/Threading.h:
• wtf/ThreadingPthreads.cpp:

(WTF::signalThread):

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 <wtf/Assertions.h>
@@ -94 +93 @@
     VM* vm() { return m_vm; }
 
-    std::optional<PlatformThread> ownerThread() const
+    std::optional<ThreadIdentifier> ownerThread() const
     {
         if (m_hasOwnerThread)
             return m_ownerThread;
-        return { };
+        return std::nullopt;
     }
-    bool currentThreadIsHoldingLock() { return m_hasOwnerThread && m_ownerThread == currentPlatformThread(); }
+    bool currentThreadIsHoldingLock() { return m_hasOwnerThread && m_ownerThread == currentThread(); }
 
     void willDestroyVM(VM*);
@@ -137 +136 @@
     // See https://bugs.webkit.org/show_bug.cgi?id=169042#c6
     bool m_hasOwnerThread { false };
-    PlatformThread m_ownerThread;
+    ThreadIdentifier m_ownerThread;
     intptr_t m_lockCount;
     unsigned m_lockDropDepth;