<!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>[161869] trunk/Source/WTF</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/161869">161869</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-13 02:12:03 -0800 (Mon, 13 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/161852">r161852</a>.
http://trac.webkit.org/changeset/161852
https://bugs.webkit.org/show_bug.cgi?id=126877
Broke ToT with system Safari (Requested by kling on #webkit).
* wtf/Threading.h:
* wtf/ThreadingPthreads.cpp:
(WTF::initializeThreading):
(WTF::lockAtomicallyInitializedStaticMutex):
(WTF::unlockAtomicallyInitializedStaticMutex):
* wtf/ThreadingWin.cpp:
(WTF::lockAtomicallyInitializedStaticMutex):
(WTF::unlockAtomicallyInitializedStaticMutex):
(WTF::initializeThreading):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfThreadingh">trunk/Source/WTF/wtf/Threading.h</a></li>
<li><a href="#trunkSourceWTFwtfThreadingPthreadscpp">trunk/Source/WTF/wtf/ThreadingPthreads.cpp</a></li>
<li><a href="#trunkSourceWTFwtfThreadingWincpp">trunk/Source/WTF/wtf/ThreadingWin.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (161868 => 161869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-01-13 09:54:13 UTC (rev 161868)
+++ trunk/Source/WTF/ChangeLog 2014-01-13 10:12:03 UTC (rev 161869)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-01-13 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r161852.
+ http://trac.webkit.org/changeset/161852
+ https://bugs.webkit.org/show_bug.cgi?id=126877
+
+ Broke ToT with system Safari (Requested by kling on #webkit).
+
+ * wtf/Threading.h:
+ * wtf/ThreadingPthreads.cpp:
+ (WTF::initializeThreading):
+ (WTF::lockAtomicallyInitializedStaticMutex):
+ (WTF::unlockAtomicallyInitializedStaticMutex):
+ * wtf/ThreadingWin.cpp:
+ (WTF::lockAtomicallyInitializedStaticMutex):
+ (WTF::unlockAtomicallyInitializedStaticMutex):
+ (WTF::initializeThreading):
+
</ins><span class="cx"> 2014-01-12 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r161840.
</span></span></pre></div>
<a id="trunkSourceWTFwtfThreadingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Threading.h (161868 => 161869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Threading.h 2014-01-13 09:54:13 UTC (rev 161868)
+++ trunk/Source/WTF/wtf/Threading.h 2014-01-13 10:12:03 UTC (rev 161869)
</span><span class="lines">@@ -69,6 +69,12 @@
</span><span class="cx"> #include <wtf/ThreadSafeRefCounted.h>
</span><span class="cx"> #include <wtf/ThreadingPrimitives.h>
</span><span class="cx">
</span><ins>+// For portability, we do not use thread-safe statics natively supported by some compilers (e.g. gcc).
+#define AtomicallyInitializedStatic(T, name) \
+ WTF::lockAtomicallyInitializedStaticMutex(); \
+ static T name; \
+ WTF::unlockAtomicallyInitializedStaticMutex();
+
</ins><span class="cx"> namespace WTF {
</span><span class="cx">
</span><span class="cx"> typedef uint32_t ThreadIdentifier;
</span><span class="lines">@@ -94,6 +100,9 @@
</span><span class="cx"> WTF_EXPORT_PRIVATE int waitForThreadCompletion(ThreadIdentifier);
</span><span class="cx"> WTF_EXPORT_PRIVATE void detachThread(ThreadIdentifier);
</span><span class="cx">
</span><ins>+WTF_EXPORT_PRIVATE void lockAtomicallyInitializedStaticMutex();
+WTF_EXPORT_PRIVATE void unlockAtomicallyInitializedStaticMutex();
+
</ins><span class="cx"> } // namespace WTF
</span><span class="cx">
</span><span class="cx"> using WTF::ThreadIdentifier;
</span></span></pre></div>
<a id="trunkSourceWTFwtfThreadingPthreadscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/ThreadingPthreads.cpp (161868 => 161869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/ThreadingPthreads.cpp 2014-01-13 09:54:13 UTC (rev 161868)
+++ trunk/Source/WTF/wtf/ThreadingPthreads.cpp 2014-01-13 10:12:03 UTC (rev 161869)
</span><span class="lines">@@ -98,6 +98,8 @@
</span><span class="cx">
</span><span class="cx"> typedef HashMap<ThreadIdentifier, std::unique_ptr<PthreadState>> ThreadMap;
</span><span class="cx">
</span><ins>+static Mutex* atomicallyInitializedStaticMutex;
+
</ins><span class="cx"> void unsafeThreadWasDetached(ThreadIdentifier);
</span><span class="cx"> void threadDidExit(ThreadIdentifier);
</span><span class="cx"> void threadWasJoined(ThreadIdentifier);
</span><span class="lines">@@ -110,9 +112,7 @@
</span><span class="cx">
</span><span class="cx"> void initializeThreading()
</span><span class="cx"> {
</span><del>- static bool isInitialized;
-
- if (isInitialized)
</del><ins>+ if (atomicallyInitializedStaticMutex)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> isInitialized = true;
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> // StringImpl::empty() does not construct its static string in a threadsafe fashion,
</span><span class="cx"> // so ensure it has been initialized from here.
</span><span class="cx"> StringImpl::empty();
</span><del>-
</del><ins>+ atomicallyInitializedStaticMutex = new Mutex;
</ins><span class="cx"> threadMapMutex();
</span><span class="cx"> initializeRandomNumberGenerator();
</span><span class="cx"> ThreadIdentifierData::initializeOnce();
</span><span class="lines">@@ -131,6 +131,17 @@
</span><span class="cx"> initializeDates();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void lockAtomicallyInitializedStaticMutex()
+{
+ ASSERT(atomicallyInitializedStaticMutex);
+ atomicallyInitializedStaticMutex->lock();
+}
+
+void unlockAtomicallyInitializedStaticMutex()
+{
+ atomicallyInitializedStaticMutex->unlock();
+}
+
</ins><span class="cx"> static ThreadMap& threadMap()
</span><span class="cx"> {
</span><span class="cx"> DEFINE_STATIC_LOCAL(ThreadMap, map, ());
</span></span></pre></div>
<a id="trunkSourceWTFwtfThreadingWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/ThreadingWin.cpp (161868 => 161869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/ThreadingWin.cpp 2014-01-13 09:54:13 UTC (rev 161868)
+++ trunk/Source/WTF/wtf/ThreadingWin.cpp 2014-01-13 10:12:03 UTC (rev 161869)
</span><span class="lines">@@ -148,6 +148,19 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static Mutex* atomicallyInitializedStaticMutex;
+
+void lockAtomicallyInitializedStaticMutex()
+{
+ ASSERT(atomicallyInitializedStaticMutex);
+ atomicallyInitializedStaticMutex->lock();
+}
+
+void unlockAtomicallyInitializedStaticMutex()
+{
+ atomicallyInitializedStaticMutex->unlock();
+}
+
</ins><span class="cx"> static Mutex& threadMapMutex()
</span><span class="cx"> {
</span><span class="cx"> static Mutex mutex;
</span><span class="lines">@@ -156,22 +169,19 @@
</span><span class="cx">
</span><span class="cx"> void initializeThreading()
</span><span class="cx"> {
</span><del>- static bool isInitialized;
-
- if (isInitialized)
</del><ins>+ if (atomicallyInitializedStaticMutex)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> WTF::double_conversion::initialize();
</span><span class="cx"> // StringImpl::empty() does not construct its static string in a threadsafe fashion,
</span><span class="cx"> // so ensure it has been initialized from here.
</span><span class="cx"> StringImpl::empty();
</span><ins>+ atomicallyInitializedStaticMutex = new Mutex;
</ins><span class="cx"> threadMapMutex();
</span><span class="cx"> initializeRandomNumberGenerator();
</span><span class="cx"> wtfThreadData();
</span><span class="cx"> s_dtoaP5Mutex = new Mutex;
</span><span class="cx"> initializeDates();
</span><del>-
- isInitialized = true;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static HashMap<DWORD, HANDLE>& threadMap()
</span></span></pre>
</div>
</div>
</body>
</html>