Changeset 160140 in webkit

Timestamp:

Dec 4, 2013 4:06:13 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r160116.
​http://trac.webkit.org/changeset/160116
​https://bugs.webkit.org/show_bug.cgi?id=125264

Change doesn't work as intended. See bug comments for details.
(Requested by bfulgham on #webkit).

• runtime/InitializeThreading.cpp:

(JSC::initializeThreading):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/InitializeThreading.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-12-04  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r160116.
+        http://trac.webkit.org/changeset/160116
+        https://bugs.webkit.org/show_bug.cgi?id=125264
+
+        Change doesn't work as intended. See bug comments for details.
+        (Requested by bfulgham on #webkit).
+
+        * runtime/InitializeThreading.cpp:
+        (JSC::initializeThreading):
+
 2013-12-04  Oliver Hunt  <oliver@apple.com>
 

trunk/Source/JavaScriptCore/runtime/InitializeThreading.cpp

@@ -42 +42 @@
 #include <wtf/dtoa.h>
 #include <wtf/Threading.h>
-#include <wtf/ThreadingOnce.h>
 #include <wtf/dtoa/cached-powers.h>
 
@@ -48 +47 @@
 
 namespace JSC {
+
+#if OS(DARWIN)
+static pthread_once_t initializeThreadingKeyOnce = PTHREAD_ONCE_INIT;
+#endif
 
 static void initializeThreadingOnce()
@@ -74 +77 @@
 void initializeThreading()
 {
-    static WTF::ThreadingOnce initializeThreadingKeyOnce;
-    initializeThreadingKeyOnce.callOnce(initializeThreadingOnce);
+#if OS(DARWIN)
+    pthread_once(&initializeThreadingKeyOnce, initializeThreadingOnce);
+#else
+    static bool initializedThreading = false;
+    if (!initializedThreading) {
+        initializeThreadingOnce();
+        initializedThreading = true;
+    }
+#endif
 }