<!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>[213901] trunk/Source/JavaScriptCore</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/213901">213901</a></dd>
<dt>Author</dt> <dd>utatane.tea@gmail.com</dd>
<dt>Date</dt> <dd>2017-03-14 09:59:37 -0700 (Tue, 14 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] Drop unnecessary pthread_attr_t for JIT enabled Linux / FreeBSD environment
https://bugs.webkit.org/show_bug.cgi?id=169592
Reviewed by Carlos Garcia Campos.
Since suspended mcontext_t has all the necessary information, we can drop
pthread_attr_t allocation and destroy for JIT enabled Linux / FreeBSD environment.
* heap/MachineStackMarker.cpp:
(JSC::MachineThreads::Thread::getRegisters):
(JSC::MachineThreads::Thread::Registers::stackPointer):
(JSC::MachineThreads::Thread::Registers::framePointer):
(JSC::MachineThreads::Thread::Registers::instructionPointer):
(JSC::MachineThreads::Thread::Registers::llintPC):
(JSC::MachineThreads::Thread::freeRegisters):
* heap/MachineStackMarker.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapMachineStackMarkercpp">trunk/Source/JavaScriptCore/heap/MachineStackMarker.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapMachineStackMarkerh">trunk/Source/JavaScriptCore/heap/MachineStackMarker.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (213900 => 213901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2017-03-14 16:16:46 UTC (rev 213900)
+++ trunk/Source/JavaScriptCore/ChangeLog 2017-03-14 16:59:37 UTC (rev 213901)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-03-14 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ [JSC] Drop unnecessary pthread_attr_t for JIT enabled Linux / FreeBSD environment
+ https://bugs.webkit.org/show_bug.cgi?id=169592
+
+ Reviewed by Carlos Garcia Campos.
+
+ Since suspended mcontext_t has all the necessary information, we can drop
+ pthread_attr_t allocation and destroy for JIT enabled Linux / FreeBSD environment.
+
+ * heap/MachineStackMarker.cpp:
+ (JSC::MachineThreads::Thread::getRegisters):
+ (JSC::MachineThreads::Thread::Registers::stackPointer):
+ (JSC::MachineThreads::Thread::Registers::framePointer):
+ (JSC::MachineThreads::Thread::Registers::instructionPointer):
+ (JSC::MachineThreads::Thread::Registers::llintPC):
+ (JSC::MachineThreads::Thread::freeRegisters):
+ * heap/MachineStackMarker.h:
+
</ins><span class="cx"> 2017-03-14 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GLib] Use USE(GLIB) guards in JavaScriptCore/inspector/EventLoop.cpp
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMachineStackMarkercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MachineStackMarker.cpp (213900 => 213901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MachineStackMarker.cpp 2017-03-14 16:16:46 UTC (rev 213900)
+++ trunk/Source/JavaScriptCore/heap/MachineStackMarker.cpp 2017-03-14 16:59:37 UTC (rev 213901)
</span><span class="lines">@@ -461,6 +461,9 @@
</span><span class="cx"> regs.ContextFlags = CONTEXT_INTEGER | CONTEXT_CONTROL;
</span><span class="cx"> GetThreadContext(platformThreadHandle, &regs);
</span><span class="cx"> return sizeof(CONTEXT);
</span><ins>+#elif ((OS(FREEBSD) || defined(__GLIBC__)) && ENABLE(JIT))
+ regs = suspendedMachineContext;
+ return sizeof(Registers::PlatformRegisters);
</ins><span class="cx"> #elif USE(PTHREADS)
</span><span class="cx"> pthread_attr_init(&regs.attribute);
</span><span class="cx"> #if HAVE(PTHREAD_NP_H) || OS(NETBSD)
</span><span class="lines">@@ -472,7 +475,6 @@
</span><span class="cx"> // FIXME: this function is non-portable; other POSIX systems may have different np alternatives
</span><span class="cx"> pthread_getattr_np(platformThread, &regs.attribute);
</span><span class="cx"> #endif
</span><del>- regs.machineContext = suspendedMachineContext;
</del><span class="cx"> return 0;
</span><span class="cx"> #else
</span><span class="cx"> #error Need a way to get thread registers on this platform
</span><span class="lines">@@ -481,13 +483,9 @@
</span><span class="cx">
</span><span class="cx"> void* MachineThreads::Thread::Registers::stackPointer() const
</span><span class="cx"> {
</span><del>-#if OS(DARWIN) || OS(WINDOWS)
</del><ins>+#if OS(DARWIN) || OS(WINDOWS) || ((OS(FREEBSD) || defined(__GLIBC__)) && ENABLE(JIT))
</ins><span class="cx"> return MachineContext::stackPointer(regs);
</span><span class="cx"> #elif USE(PTHREADS)
</span><del>-
-#if (OS(FREEBSD) || defined(__GLIBC__)) && ENABLE(JIT)
- return MachineContext::stackPointer(regs.machineContext);
-#else
</del><span class="cx"> void* stackBase = 0;
</span><span class="cx"> size_t stackSize = 0;
</span><span class="cx"> #if OS(OPENBSD)
</span><span class="lines">@@ -501,8 +499,6 @@
</span><span class="cx"> (void)rc; // FIXME: Deal with error code somehow? Seems fatal.
</span><span class="cx"> ASSERT(stackBase);
</span><span class="cx"> return static_cast<char*>(stackBase) + stackSize;
</span><del>-#endif
-
</del><span class="cx"> #else
</span><span class="cx"> #error Need a way to get the stack pointer for another thread on this platform
</span><span class="cx"> #endif
</span><span class="lines">@@ -511,10 +507,8 @@
</span><span class="cx"> #if ENABLE(SAMPLING_PROFILER)
</span><span class="cx"> void* MachineThreads::Thread::Registers::framePointer() const
</span><span class="cx"> {
</span><del>-#if OS(DARWIN) || OS(WINDOWS)
</del><ins>+#if OS(DARWIN) || OS(WINDOWS) || (OS(FREEBSD) || defined(__GLIBC__))
</ins><span class="cx"> return MachineContext::framePointer(regs);
</span><del>-#elif OS(FREEBSD) || defined(__GLIBC__)
- return MachineContext::framePointer(regs.machineContext);
</del><span class="cx"> #else
</span><span class="cx"> #error Need a way to get the frame pointer for another thread on this platform
</span><span class="cx"> #endif
</span><span class="lines">@@ -522,10 +516,8 @@
</span><span class="cx">
</span><span class="cx"> void* MachineThreads::Thread::Registers::instructionPointer() const
</span><span class="cx"> {
</span><del>-#if OS(DARWIN) || OS(WINDOWS)
</del><ins>+#if OS(DARWIN) || OS(WINDOWS) || (OS(FREEBSD) || defined(__GLIBC__))
</ins><span class="cx"> return MachineContext::instructionPointer(regs);
</span><del>-#elif OS(FREEBSD) || defined(__GLIBC__)
- return MachineContext::instructionPointer(regs.machineContext);
</del><span class="cx"> #else
</span><span class="cx"> #error Need a way to get the instruction pointer for another thread on this platform
</span><span class="cx"> #endif
</span><span class="lines">@@ -534,10 +526,8 @@
</span><span class="cx"> void* MachineThreads::Thread::Registers::llintPC() const
</span><span class="cx"> {
</span><span class="cx"> // LLInt uses regT4 as PC.
</span><del>-#if OS(DARWIN) || OS(WINDOWS)
</del><ins>+#if OS(DARWIN) || OS(WINDOWS) || (OS(FREEBSD) || defined(__GLIBC__))
</ins><span class="cx"> return MachineContext::llintInstructionPointer(regs);
</span><del>-#elif OS(FREEBSD) || defined(__GLIBC__)
- return MachineContext::llintInstructionPointer(regs.machineContext);
</del><span class="cx"> #else
</span><span class="cx"> #error Need a way to get the LLIntPC for another thread on this platform
</span><span class="cx"> #endif
</span><span class="lines">@@ -547,7 +537,7 @@
</span><span class="cx"> void MachineThreads::Thread::freeRegisters(Thread::Registers& registers)
</span><span class="cx"> {
</span><span class="cx"> Thread::Registers::PlatformRegisters& regs = registers.regs;
</span><del>-#if USE(PTHREADS) && !OS(WINDOWS) && !OS(DARWIN)
</del><ins>+#if USE(PTHREADS) && !OS(WINDOWS) && !OS(DARWIN) && !((OS(FREEBSD) || defined(__GLIBC__)) && ENABLE(JIT))
</ins><span class="cx"> pthread_attr_destroy(&regs.attribute);
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(regs);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMachineStackMarkerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MachineStackMarker.h (213900 => 213901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MachineStackMarker.h 2017-03-14 16:16:46 UTC (rev 213900)
+++ trunk/Source/JavaScriptCore/heap/MachineStackMarker.h 2017-03-14 16:59:37 UTC (rev 213901)
</span><span class="lines">@@ -83,10 +83,11 @@
</span><span class="cx">
</span><span class="cx"> #if OS(DARWIN) || OS(WINDOWS)
</span><span class="cx"> using PlatformRegisters = MachineContext::PlatformRegisters;
</span><ins>+#elif (OS(FREEBSD) || defined(__GLIBC__)) && ENABLE(JIT)
+ using PlatformRegisters = mcontext_t;
</ins><span class="cx"> #elif USE(PTHREADS)
</span><span class="cx"> struct PlatformRegisters {
</span><span class="cx"> pthread_attr_t attribute;
</span><del>- mcontext_t machineContext;
</del><span class="cx"> };
</span><span class="cx"> #else
</span><span class="cx"> #error Need a thread register struct for this platform
</span></span></pre>
</div>
</div>
</body>
</html>