<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[214489] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/214489">214489</a></dd>
<dt>Author</dt> <dd>utatane.tea@gmail.com</dd>
<dt>Date</dt> <dd>2017-03-28 13:08:49 -0700 (Tue, 28 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSLockcpp">trunk/Source/JavaScriptCore/runtime/JSLock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSLockh">trunk/Source/JavaScriptCore/runtime/JSLock.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimePlatformThreadh">trunk/Source/JavaScriptCore/runtime/PlatformThread.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMh">trunk/Source/JavaScriptCore/runtime/VM.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMTrapscpp">trunk/Source/JavaScriptCore/runtime/VMTraps.cpp</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfThreadingh">trunk/Source/WTF/wtf/Threading.h</a></li>
<li><a href="#trunkSourceWTFwtfThreadingPthreadscpp">trunk/Source/WTF/wtf/ThreadingPthreads.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (214488 => 214489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2017-03-28 20:02:10 UTC (rev 214488)
+++ trunk/Source/JavaScriptCore/ChangeLog 2017-03-28 20:08:49 UTC (rev 214489)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2017-03-25 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ [JSC] Move platformThreadSignal to WTF
+ https://bugs.webkit.org/show_bug.cgi?id=170097
+
+ Reviewed by Mark Lam.
+
+ 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):
+
</ins><span class="cx"> 2017-03-28 JF Bastien <jfbastien@apple.com>
</span><span class="cx">
</span><span class="cx"> WebAssembly: implement Module imports/exports
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSLockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSLock.cpp (214488 => 214489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSLock.cpp 2017-03-28 20:02:10 UTC (rev 214488)
+++ trunk/Source/JavaScriptCore/runtime/JSLock.cpp 2017-03-28 20:08:49 UTC (rev 214489)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> m_lock.lock();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_ownerThread = currentPlatformThread();
</del><ins>+ m_ownerThread = currentThread();
</ins><span class="cx"> WTF::storeStoreFence();
</span><span class="cx"> m_hasOwnerThread = true;
</span><span class="cx"> ASSERT(!m_lockCount);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSLockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSLock.h (214488 => 214489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSLock.h 2017-03-28 20:02:10 UTC (rev 214488)
+++ trunk/Source/JavaScriptCore/runtime/JSLock.h 2017-03-28 20:08:49 UTC (rev 214489)
</span><span class="lines">@@ -20,7 +20,6 @@
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><del>-#include "PlatformThread.h"
</del><span class="cx"> #include <mutex>
</span><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/Lock.h>
</span><span class="lines">@@ -93,13 +92,13 @@
</span><span class="cx">
</span><span class="cx"> VM* vm() { return m_vm; }
</span><span class="cx">
</span><del>- std::optional<PlatformThread> ownerThread() const
</del><ins>+ std::optional<ThreadIdentifier> ownerThread() const
</ins><span class="cx"> {
</span><span class="cx"> if (m_hasOwnerThread)
</span><span class="cx"> return m_ownerThread;
</span><del>- return { };
</del><ins>+ return std::nullopt;
</ins><span class="cx"> }
</span><del>- bool currentThreadIsHoldingLock() { return m_hasOwnerThread && m_ownerThread == currentPlatformThread(); }
</del><ins>+ bool currentThreadIsHoldingLock() { return m_hasOwnerThread && m_ownerThread == currentThread(); }
</ins><span class="cx">
</span><span class="cx"> void willDestroyVM(VM*);
</span><span class="cx">
</span><span class="lines">@@ -136,7 +135,7 @@
</span><span class="cx"> // different thread, and an optional is vulnerable to races.
</span><span class="cx"> // See https://bugs.webkit.org/show_bug.cgi?id=169042#c6
</span><span class="cx"> bool m_hasOwnerThread { false };
</span><del>- PlatformThread m_ownerThread;
</del><ins>+ ThreadIdentifier m_ownerThread;
</ins><span class="cx"> intptr_t m_lockCount;
</span><span class="cx"> unsigned m_lockDropDepth;
</span><span class="cx"> bool m_shouldReleaseHeapAccess;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimePlatformThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/PlatformThread.h (214488 => 214489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/PlatformThread.h 2017-03-28 20:02:10 UTC (rev 214488)
+++ trunk/Source/JavaScriptCore/runtime/PlatformThread.h 2017-03-28 20:08:49 UTC (rev 214489)
</span><span class="lines">@@ -60,19 +60,4 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if OS(DARWIN)
-inline bool platformThreadSignal(PlatformThread platformThread, int signalNumber)
-{
- pthread_t pthreadID = pthread_from_mach_thread_np(platformThread);
- int errNo = pthread_kill(pthreadID, signalNumber);
- return !errNo; // A 0 errNo means success.
-}
-#elif USE(PTHREADS)
-inline bool platformThreadSignal(PlatformThread pthreadID, int signalNumber)
-{
- int errNo = pthread_kill(pthreadID, signalNumber);
- return !errNo; // A 0 errNo means success.
-}
-#endif
-
</del><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.h (214488 => 214489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.h 2017-03-28 20:02:10 UTC (rev 214488)
+++ trunk/Source/JavaScriptCore/runtime/VM.h 2017-03-28 20:08:49 UTC (rev 214489)
</span><span class="lines">@@ -673,7 +673,7 @@
</span><span class="cx"> template<typename Func>
</span><span class="cx"> void logEvent(CodeBlock*, const char* summary, const Func& func);
</span><span class="cx">
</span><del>- std::optional<PlatformThread> ownerThread() const { return m_apiLock->ownerThread(); }
</del><ins>+ std::optional<ThreadIdentifier> ownerThread() const { return m_apiLock->ownerThread(); }
</ins><span class="cx">
</span><span class="cx"> VMTraps& traps() { return m_traps; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMTrapscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VMTraps.cpp (214488 => 214489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VMTraps.cpp 2017-03-28 20:02:10 UTC (rev 214488)
+++ trunk/Source/JavaScriptCore/runtime/VMTraps.cpp 2017-03-28 20:08:49 UTC (rev 214489)
</span><span class="lines">@@ -455,7 +455,7 @@
</span><span class="cx"> VM& vm = *m_vm;
</span><span class="cx"> auto optionalOwnerThread = vm.ownerThread();
</span><span class="cx"> if (optionalOwnerThread) {
</span><del>- platformThreadSignal(optionalOwnerThread.value(), SIGUSR1);
</del><ins>+ signalThread(optionalOwnerThread.value(), SIGUSR1);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (214488 => 214489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2017-03-28 20:02:10 UTC (rev 214488)
+++ trunk/Source/WTF/ChangeLog 2017-03-28 20:08:49 UTC (rev 214489)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-03-25 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ [JSC] Move platformThreadSignal to WTF
+ https://bugs.webkit.org/show_bug.cgi?id=170097
+
+ Reviewed by Mark Lam.
+
+ * wtf/Threading.h:
+ * wtf/ThreadingPthreads.cpp:
+ (WTF::signalThread):
+
</ins><span class="cx"> 2017-03-26 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> B3::fixSSA should do liveness pruning
</span></span></pre></div>
<a id="trunkSourceWTFwtfThreadingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Threading.h (214488 => 214489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Threading.h 2017-03-28 20:02:10 UTC (rev 214488)
+++ trunk/Source/WTF/wtf/Threading.h 2017-03-28 20:08:49 UTC (rev 214489)
</span><span class="lines">@@ -79,6 +79,10 @@
</span><span class="cx">
</span><span class="cx"> const char* normalizeThreadName(const char* threadName);
</span><span class="cx">
</span><ins>+#if USE(PTHREADS)
+bool signalThread(ThreadIdentifier, int signalNumber);
+#endif
+
</ins><span class="cx"> #if HAVE(QOS_CLASSES)
</span><span class="cx"> WTF_EXPORT_PRIVATE void setGlobalMaxQOSClass(qos_class_t);
</span><span class="cx"> WTF_EXPORT_PRIVATE qos_class_t adjustedQOSClass(qos_class_t);
</span><span class="lines">@@ -93,6 +97,10 @@
</span><span class="cx"> using WTF::detachThread;
</span><span class="cx"> using WTF::waitForThreadCompletion;
</span><span class="cx">
</span><ins>+#if USE(PTHREADS)
+using WTF::signalThread;
+#endif
+
</ins><span class="cx"> #if HAVE(QOS_CLASSES)
</span><span class="cx"> using WTF::setGlobalMaxQOSClass;
</span><span class="cx"> using WTF::adjustedQOSClass;
</span></span></pre></div>
<a id="trunkSourceWTFwtfThreadingPthreadscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/ThreadingPthreads.cpp (214488 => 214489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/ThreadingPthreads.cpp 2017-03-28 20:02:10 UTC (rev 214488)
+++ trunk/Source/WTF/wtf/ThreadingPthreads.cpp 2017-03-28 20:08:49 UTC (rev 214489)
</span><span class="lines">@@ -59,6 +59,10 @@
</span><span class="cx"> #include <sys/prctl.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if !OS(DARWIN)
+#include <signal.h>
+#endif
+
</ins><span class="cx"> namespace WTF {
</span><span class="cx">
</span><span class="cx"> class PthreadState {
</span><span class="lines">@@ -307,6 +311,19 @@
</span><span class="cx"> return id;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool signalThread(ThreadIdentifier threadID, int signalNumber)
+{
+ pthread_t pthreadHandle;
+ ASSERT(threadID);
+ {
+ MutexLocker locker(threadMapMutex());
+ pthreadHandle = pthreadHandleForIdentifierWithLockAlreadyHeld(threadID);
+ ASSERT(pthreadHandle);
+ }
+ int errNo = pthread_kill(pthreadHandle, signalNumber);
+ return !errNo; // A 0 errNo means success.
+}
+
</ins><span class="cx"> Mutex::Mutex()
</span><span class="cx"> {
</span><span class="cx"> pthread_mutexattr_t attr;
</span></span></pre>
</div>
</div>
</body>
</html>