Title: [105987] trunk/Source/_javascript_Core
- Revision
- 105987
- Author
- zimmerm...@webkit.org
- Date
- 2012-01-26 03:58:40 -0800 (Thu, 26 Jan 2012)
Log Message
Unreviewed, rolling out r105982.
http://trac.webkit.org/changeset/105982
https://bugs.webkit.org/show_bug.cgi?id=77090
breaks the world (Requested by WildFox on #webkit).
Patch by Sheriff Bot <webkit.review....@gmail.com> on 2012-01-26
* wtf/MainThread.cpp:
(WTF):
* wtf/Platform.h:
* wtf/mac/MainThreadMac.mm:
(WTF):
(WTF::registerGCThread):
(WTF::isMainThreadOrGCThread):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (105986 => 105987)
--- trunk/Source/_javascript_Core/ChangeLog 2012-01-26 11:08:26 UTC (rev 105986)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-01-26 11:58:40 UTC (rev 105987)
@@ -1,3 +1,19 @@
+2012-01-26 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r105982.
+ http://trac.webkit.org/changeset/105982
+ https://bugs.webkit.org/show_bug.cgi?id=77090
+
+ breaks the world (Requested by WildFox on #webkit).
+
+ * wtf/MainThread.cpp:
+ (WTF):
+ * wtf/Platform.h:
+ * wtf/mac/MainThreadMac.mm:
+ (WTF):
+ (WTF::registerGCThread):
+ (WTF::isMainThreadOrGCThread):
+
2012-01-26 Roland Takacs <takacs.rol...@stud.u-szeged.hu>
[Qt] GC should be parallel on Qt platform
Modified: trunk/Source/_javascript_Core/wtf/MainThread.cpp (105986 => 105987)
--- trunk/Source/_javascript_Core/wtf/MainThread.cpp 2012-01-26 11:08:26 UTC (rev 105986)
+++ trunk/Source/_javascript_Core/wtf/MainThread.cpp 2012-01-26 11:58:40 UTC (rev 105987)
@@ -34,7 +34,6 @@
#include "Functional.h"
#include "StdLibExtras.h"
#include "Threading.h"
-#include <wtf/ThreadSpecific.h>
#if PLATFORM(CHROMIUM)
#error Chromium uses a different main thread implementation
@@ -250,33 +249,4 @@
}
#endif
-#if ENABLE(PARALLEL_GC)
-static ThreadSpecific<bool>* isGCThread;
-
-void registerGCThread()
-{
- if (!isGCThread) {
- // This happens if we're running in a process that doesn't care about
- // MainThread.
- return;
- }
-
- **isGCThread = true;
-}
-
-bool isMainThreadOrGCThread()
-{
- if (isGCThread->isSet() && **isGCThread)
- return true;
-
- return isMainThread();
-}
-#elif PLATFORM(MAC)
-// This is necessary because _javascript_Core.exp doesn't support preprocessor macros.
-bool isMainThreadOrGCThread()
-{
- return isMainThread();
-}
-#endif
-
} // namespace WTF
Modified: trunk/Source/_javascript_Core/wtf/Platform.h (105986 => 105987)
--- trunk/Source/_javascript_Core/wtf/Platform.h 2012-01-26 11:08:26 UTC (rev 105986)
+++ trunk/Source/_javascript_Core/wtf/Platform.h 2012-01-26 11:58:40 UTC (rev 105987)
@@ -1120,7 +1120,7 @@
#define ENABLE_COMPARE_AND_SWAP 1
#endif
-#if !defined(ENABLE_PARALLEL_GC) && (PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(QT)) && ENABLE(COMPARE_AND_SWAP)
+#if !defined(ENABLE_PARALLEL_GC) && (PLATFORM(MAC) || PLATFORM(IOS)) && ENABLE(COMPARE_AND_SWAP)
#define ENABLE_PARALLEL_GC 1
#endif
Modified: trunk/Source/_javascript_Core/wtf/mac/MainThreadMac.mm (105986 => 105987)
--- trunk/Source/_javascript_Core/wtf/mac/MainThreadMac.mm 2012-01-26 11:08:26 UTC (rev 105986)
+++ trunk/Source/_javascript_Core/wtf/mac/MainThreadMac.mm 2012-01-26 11:58:40 UTC (rev 105987)
@@ -145,4 +145,31 @@
return pthread_equal(pthread_self(), mainThreadPthread);
}
+#if ENABLE(PARALLEL_GC)
+void registerGCThread()
+{
+ if (!isGCThread) {
+ // This happens if we're running in a process that doesn't care about
+ // MainThread.
+ return;
+ }
+
+ **isGCThread = true;
+}
+
+bool isMainThreadOrGCThread()
+{
+ if (isGCThread->isSet() && **isGCThread)
+ return true;
+
+ return isMainThread();
+}
+#else
+// This is necessary because _javascript_Core.exp doesn't support preprocessor macros.
+bool isMainThreadOrGCThread()
+{
+ return isMainThread();
+}
+#endif
+
} // namespace WTF
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
