<!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>[169179] branches/safari-538.34-branch/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/169179">169179</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-05-21 15:03:50 -0700 (Wed, 21 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/169151">r169151</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53834branchSourceJavaScriptCoreChangeLog">branches/safari-538.34-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari53834branchSourceJavaScriptCoreheapBlockAllocatorcpp">branches/safari-538.34-branch/Source/JavaScriptCore/heap/BlockAllocator.cpp</a></li>
<li><a href="#branchessafari53834branchSourceWTFChangeLog">branches/safari-538.34-branch/Source/WTF/ChangeLog</a></li>
<li><a href="#branchessafari53834branchSourceWTFwtfFastMalloccpp">branches/safari-538.34-branch/Source/WTF/wtf/FastMalloc.cpp</a></li>
<li><a href="#branchessafari53834branchSourceWTFwtfThreadingh">branches/safari-538.34-branch/Source/WTF/wtf/Threading.h</a></li>
<li><a href="#branchessafari53834branchSourceWTFwtfThreadingPthreadscpp">branches/safari-538.34-branch/Source/WTF/wtf/ThreadingPthreads.cpp</a></li>
<li><a href="#branchessafari53834branchSourceWTFwtfThreadingWincpp">branches/safari-538.34-branch/Source/WTF/wtf/ThreadingWin.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53834branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/JavaScriptCore/ChangeLog (169178 => 169179)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/JavaScriptCore/ChangeLog 2014-05-21 21:50:39 UTC (rev 169178)
+++ branches/safari-538.34-branch/Source/JavaScriptCore/ChangeLog 2014-05-21 22:03:50 UTC (rev 169179)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-05-21 Dana Burkart <dburkart@apple.com>
+
+ Merge r169151.
+
+ 2014-05-20 Geoffrey Garen <ggaren@apple.com>
+
+ Rolled out <http://trac.webkit.org/changeset/166184>
+ https://bugs.webkit.org/show_bug.cgi?id=133144
+
+ Reviewed by Gavin Barraclough.
+
+ It caused a performance regression.
+
+ * heap/BlockAllocator.cpp:
+ (JSC::BlockAllocator::blockFreeingThreadStartFunc):
+
</ins><span class="cx"> 2014-05-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r169094.
</span></span></pre></div>
<a id="branchessafari53834branchSourceJavaScriptCoreheapBlockAllocatorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/JavaScriptCore/heap/BlockAllocator.cpp (169178 => 169179)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/JavaScriptCore/heap/BlockAllocator.cpp 2014-05-21 21:50:39 UTC (rev 169178)
+++ branches/safari-538.34-branch/Source/JavaScriptCore/heap/BlockAllocator.cpp 2014-05-21 22:03:50 UTC (rev 169179)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #include "JSCInlines.h"
</span><span class="cx"> #include "WeakBlock.h"
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><del>-#include <wtf/Threading.h>
</del><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="lines">@@ -118,7 +117,6 @@
</span><span class="cx">
</span><span class="cx"> void BlockAllocator::blockFreeingThreadStartFunc(void* blockAllocator)
</span><span class="cx"> {
</span><del>- setCurrentThreadQOSUtility();
</del><span class="cx"> static_cast<BlockAllocator*>(blockAllocator)->blockFreeingThreadMain();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WTF/ChangeLog (169178 => 169179)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WTF/ChangeLog 2014-05-21 21:50:39 UTC (rev 169178)
+++ branches/safari-538.34-branch/Source/WTF/ChangeLog 2014-05-21 22:03:50 UTC (rev 169179)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-05-21 Dana Burkart <dburkart@apple.com>
+
+ Merge r169151.
+
+ 2014-05-20 Geoffrey Garen <ggaren@apple.com>
+
+ Rolled out <http://trac.webkit.org/changeset/166184>
+ https://bugs.webkit.org/show_bug.cgi?id=133144
+
+ Reviewed by Gavin Barraclough.
+
+ It caused a performance regression.
+
+ * wtf/FastMalloc.cpp:
+ (WTF::TCMalloc_PageHeap::runScavengerThread):
+ * wtf/Threading.h:
+ * wtf/ThreadingPthreads.cpp:
+ (WTF::createThreadInternal):
+ (WTF::setCurrentThreadQOSUtility): Deleted.
+ * wtf/ThreadingWin.cpp:
+ (WTF::setCurrentThreadQOSUtility): Deleted.
+
</ins><span class="cx"> 2014-05-14 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r168459
</span></span></pre></div>
<a id="branchessafari53834branchSourceWTFwtfFastMalloccpp"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WTF/wtf/FastMalloc.cpp (169178 => 169179)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WTF/wtf/FastMalloc.cpp 2014-05-21 21:50:39 UTC (rev 169178)
+++ branches/safari-538.34-branch/Source/WTF/wtf/FastMalloc.cpp 2014-05-21 22:03:50 UTC (rev 169179)
</span><span class="lines">@@ -79,7 +79,6 @@
</span><span class="cx">
</span><span class="cx"> #include "Assertions.h"
</span><span class="cx"> #include "CurrentTime.h"
</span><del>-#include "Threading.h"
</del><span class="cx">
</span><span class="cx"> #include <limits>
</span><span class="cx"> #if OS(WINDOWS)
</span><span class="lines">@@ -2121,8 +2120,6 @@
</span><span class="cx">
</span><span class="cx"> void* TCMalloc_PageHeap::runScavengerThread(void* context)
</span><span class="cx"> {
</span><del>- setCurrentThreadQOSUtility();
-
</del><span class="cx"> static_cast<TCMalloc_PageHeap*>(context)->scavengerThread();
</span><span class="cx"> #if (COMPILER(MSVC) || COMPILER(SUNCC))
</span><span class="cx"> // Without this, Visual Studio and Sun Studio will complain that this method does not return a value.
</span></span></pre></div>
<a id="branchessafari53834branchSourceWTFwtfThreadingh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WTF/wtf/Threading.h (169178 => 169179)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WTF/wtf/Threading.h 2014-05-21 21:50:39 UTC (rev 169178)
+++ branches/safari-538.34-branch/Source/WTF/wtf/Threading.h 2014-05-21 22:03:50 UTC (rev 169179)
</span><span class="lines">@@ -89,7 +89,6 @@
</span><span class="cx"> void initializeCurrentThreadInternal(const char* threadName);
</span><span class="cx">
</span><span class="cx"> WTF_EXPORT_PRIVATE ThreadIdentifier currentThread();
</span><del>-WTF_EXPORT_PRIVATE void setCurrentThreadQOSUtility();
</del><span class="cx"> WTF_EXPORT_PRIVATE void changeThreadPriority(ThreadIdentifier, int);
</span><span class="cx"> WTF_EXPORT_PRIVATE int waitForThreadCompletion(ThreadIdentifier);
</span><span class="cx"> WTF_EXPORT_PRIVATE void detachThread(ThreadIdentifier);
</span><span class="lines">@@ -100,7 +99,6 @@
</span><span class="cx"> using WTF::createThread;
</span><span class="cx"> using WTF::currentThread;
</span><span class="cx"> using WTF::changeThreadPriority;
</span><del>-using WTF::setCurrentThreadQOSUtility;
</del><span class="cx"> using WTF::detachThread;
</span><span class="cx"> using WTF::waitForThreadCompletion;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWTFwtfThreadingPthreadscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WTF/wtf/ThreadingPthreads.cpp (169178 => 169179)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WTF/wtf/ThreadingPthreads.cpp 2014-05-21 21:50:39 UTC (rev 169178)
+++ branches/safari-538.34-branch/Source/WTF/wtf/ThreadingPthreads.cpp 2014-05-21 22:03:50 UTC (rev 169179)
</span><span class="lines">@@ -175,15 +175,7 @@
</span><span class="cx"> {
</span><span class="cx"> auto invocation = std::make_unique<ThreadFunctionInvocation>(entryPoint, data);
</span><span class="cx"> pthread_t threadHandle;
</span><del>- pthread_attr_t attr;
- pthread_attr_init(&attr);
-#if OS(MAC_OS_X) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
- pthread_attr_set_qos_class_np(&attr, QOS_CLASS_USER_INTERACTIVE, 0);
-#endif
- int error = pthread_create(&threadHandle, &attr, wtfThreadEntryPoint, invocation.get());
- pthread_attr_destroy(&attr);
-
- if (error) {
</del><ins>+ if (pthread_create(&threadHandle, 0, wtfThreadEntryPoint, invocation.get())) {
</ins><span class="cx"> LOG_ERROR("Failed to create pthread at entry point %p with data %p", wtfThreadEntryPoint, invocation.get());
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -236,13 +228,6 @@
</span><span class="cx"> pthread_setschedparam(pthreadHandle, policy, &param);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void setCurrentThreadQOSUtility()
-{
-#if OS(MAC_OS_X) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
- pthread_set_qos_class_self_np(QOS_CLASS_UTILITY, 0);
-#endif
-}
-
</del><span class="cx"> int waitForThreadCompletion(ThreadIdentifier threadID)
</span><span class="cx"> {
</span><span class="cx"> pthread_t pthreadHandle;
</span></span></pre></div>
<a id="branchessafari53834branchSourceWTFwtfThreadingWincpp"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WTF/wtf/ThreadingWin.cpp (169178 => 169179)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WTF/wtf/ThreadingWin.cpp 2014-05-21 21:50:39 UTC (rev 169178)
+++ branches/safari-538.34-branch/Source/WTF/wtf/ThreadingWin.cpp 2014-05-21 22:03:50 UTC (rev 169179)
</span><span class="lines">@@ -257,10 +257,6 @@
</span><span class="cx"> SetThreadPriority(threadHandle, THREAD_PRIORITY_NORMAL + delta);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void setCurrentThreadQOSUtility()
-{
-}
-
</del><span class="cx"> int waitForThreadCompletion(ThreadIdentifier threadID)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(threadID);
</span></span></pre>
</div>
</div>
</body>
</html>