Diff
Modified: branches/safari-538.34-branch/Source/_javascript_Core/ChangeLog (169178 => 169179)
--- branches/safari-538.34-branch/Source/_javascript_Core/ChangeLog 2014-05-21 21:50:39 UTC (rev 169178)
+++ branches/safari-538.34-branch/Source/_javascript_Core/ChangeLog 2014-05-21 22:03:50 UTC (rev 169179)
@@ -1,3 +1,19 @@
+2014-05-21 Dana Burkart <[email protected]>
+
+ Merge r169151.
+
+ 2014-05-20 Geoffrey Garen <[email protected]>
+
+ 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):
+
2014-05-20 Matthew Hanson <[email protected]>
Merge r169094.
Modified: branches/safari-538.34-branch/Source/_javascript_Core/heap/BlockAllocator.cpp (169178 => 169179)
--- branches/safari-538.34-branch/Source/_javascript_Core/heap/BlockAllocator.cpp 2014-05-21 21:50:39 UTC (rev 169178)
+++ branches/safari-538.34-branch/Source/_javascript_Core/heap/BlockAllocator.cpp 2014-05-21 22:03:50 UTC (rev 169179)
@@ -32,7 +32,6 @@
#include "JSCInlines.h"
#include "WeakBlock.h"
#include <wtf/CurrentTime.h>
-#include <wtf/Threading.h>
namespace JSC {
@@ -118,7 +117,6 @@
void BlockAllocator::blockFreeingThreadStartFunc(void* blockAllocator)
{
- setCurrentThreadQOSUtility();
static_cast<BlockAllocator*>(blockAllocator)->blockFreeingThreadMain();
}
Modified: branches/safari-538.34-branch/Source/WTF/ChangeLog (169178 => 169179)
--- 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)
@@ -1,3 +1,25 @@
+2014-05-21 Dana Burkart <[email protected]>
+
+ Merge r169151.
+
+ 2014-05-20 Geoffrey Garen <[email protected]>
+
+ 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.
+
2014-05-14 Lucas Forschler <[email protected]>
Merge r168459
Modified: branches/safari-538.34-branch/Source/WTF/wtf/FastMalloc.cpp (169178 => 169179)
--- 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)
@@ -79,7 +79,6 @@
#include "Assertions.h"
#include "CurrentTime.h"
-#include "Threading.h"
#include <limits>
#if OS(WINDOWS)
@@ -2121,8 +2120,6 @@
void* TCMalloc_PageHeap::runScavengerThread(void* context)
{
- setCurrentThreadQOSUtility();
-
static_cast<TCMalloc_PageHeap*>(context)->scavengerThread();
#if (COMPILER(MSVC) || COMPILER(SUNCC))
// Without this, Visual Studio and Sun Studio will complain that this method does not return a value.
Modified: branches/safari-538.34-branch/Source/WTF/wtf/Threading.h (169178 => 169179)
--- 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)
@@ -89,7 +89,6 @@
void initializeCurrentThreadInternal(const char* threadName);
WTF_EXPORT_PRIVATE ThreadIdentifier currentThread();
-WTF_EXPORT_PRIVATE void setCurrentThreadQOSUtility();
WTF_EXPORT_PRIVATE void changeThreadPriority(ThreadIdentifier, int);
WTF_EXPORT_PRIVATE int waitForThreadCompletion(ThreadIdentifier);
WTF_EXPORT_PRIVATE void detachThread(ThreadIdentifier);
@@ -100,7 +99,6 @@
using WTF::createThread;
using WTF::currentThread;
using WTF::changeThreadPriority;
-using WTF::setCurrentThreadQOSUtility;
using WTF::detachThread;
using WTF::waitForThreadCompletion;
Modified: branches/safari-538.34-branch/Source/WTF/wtf/ThreadingPthreads.cpp (169178 => 169179)
--- 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)
@@ -175,15 +175,7 @@
{
auto invocation = std::make_unique<ThreadFunctionInvocation>(entryPoint, data);
pthread_t threadHandle;
- 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) {
+ if (pthread_create(&threadHandle, 0, wtfThreadEntryPoint, invocation.get())) {
LOG_ERROR("Failed to create pthread at entry point %p with data %p", wtfThreadEntryPoint, invocation.get());
return 0;
}
@@ -236,13 +228,6 @@
pthread_setschedparam(pthreadHandle, policy, ¶m);
}
-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
-}
-
int waitForThreadCompletion(ThreadIdentifier threadID)
{
pthread_t pthreadHandle;
Modified: branches/safari-538.34-branch/Source/WTF/wtf/ThreadingWin.cpp (169178 => 169179)
--- 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)
@@ -257,10 +257,6 @@
SetThreadPriority(threadHandle, THREAD_PRIORITY_NORMAL + delta);
}
-void setCurrentThreadQOSUtility()
-{
-}
-
int waitForThreadCompletion(ThreadIdentifier threadID)
{
ASSERT(threadID);
