<!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>[161146] trunk/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/161146">161146</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2013-12-30 11:32:52 -0800 (Mon, 30 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Replace WTF::ThreadingOnce with std::call_once
https://bugs.webkit.org/show_bug.cgi?id=126215
Reviewed by Sam Weinig.
Source/JavaScriptCore:
* dfg/DFGWorklist.cpp:
(JSC::DFG::globalWorklist):
* runtime/InitializeThreading.cpp:
(JSC::initializeThreading):
Source/WTF:
* GNUmakefile.list.am:
* wtf/CompilationThread.cpp:
(WTF::initializeCompilationThreads):
* wtf/ThreadingOnce.h: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGWorklistcpp">trunk/Source/JavaScriptCore/dfg/DFGWorklist.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeInitializeThreadingcpp">trunk/Source/JavaScriptCore/runtime/InitializeThreading.cpp</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFGNUmakefilelistam">trunk/Source/WTF/GNUmakefile.list.am</a></li>
<li><a href="#trunkSourceWTFwtfCompilationThreadcpp">trunk/Source/WTF/wtf/CompilationThread.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWTFwtfThreadingOnceh">trunk/Source/WTF/wtf/ThreadingOnce.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (161145 => 161146)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2013-12-30 18:45:37 UTC (rev 161145)
+++ trunk/Source/JavaScriptCore/ChangeLog 2013-12-30 19:32:52 UTC (rev 161146)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2013-12-30 Anders Carlsson <andersca@apple.com>
+
+ Replace WTF::ThreadingOnce with std::call_once
+ https://bugs.webkit.org/show_bug.cgi?id=126215
+
+ Reviewed by Sam Weinig.
+
+ * dfg/DFGWorklist.cpp:
+ (JSC::DFG::globalWorklist):
+ * runtime/InitializeThreading.cpp:
+ (JSC::initializeThreading):
+
</ins><span class="cx"> 2013-12-30 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CMake] [GTK] Add support for GObject introspection
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGWorklistcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGWorklist.cpp (161145 => 161146)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGWorklist.cpp 2013-12-30 18:45:37 UTC (rev 161145)
+++ trunk/Source/JavaScriptCore/dfg/DFGWorklist.cpp 2013-12-30 19:32:52 UTC (rev 161146)
</span><span class="lines">@@ -31,9 +31,8 @@
</span><span class="cx"> #include "CodeBlock.h"
</span><span class="cx"> #include "DeferGC.h"
</span><span class="cx"> #include "DFGLongLivedState.h"
</span><ins>+#include <mutex>
</ins><span class="cx">
</span><del>-#include <wtf/ThreadingOnce.h>
-
</del><span class="cx"> namespace JSC { namespace DFG {
</span><span class="cx">
</span><span class="cx"> Worklist::Worklist()
</span><span class="lines">@@ -264,22 +263,20 @@
</span><span class="cx">
</span><span class="cx"> static Worklist* theGlobalWorklist;
</span><span class="cx">
</span><del>-static void initializeGlobalWorklistOnce()
-{
- unsigned numberOfThreads;
-
- if (Options::useExperimentalFTL())
- numberOfThreads = 1; // We don't yet use LLVM in a thread-safe way.
- else
- numberOfThreads = Options::numberOfCompilerThreads();
-
- theGlobalWorklist = Worklist::create(numberOfThreads).leakRef();
-}
-
</del><span class="cx"> Worklist* globalWorklist()
</span><span class="cx"> {
</span><del>- static WTF::ThreadingOnce initializeGlobalWorklistKeyOnce;
- initializeGlobalWorklistKeyOnce.callOnce(initializeGlobalWorklistOnce);
</del><ins>+ static std::once_flag initializeGlobalWorklistOnceFlag;
+ std::call_once(initializeGlobalWorklistOnceFlag, [] {
+ unsigned numberOfThreads;
+
+ if (Options::useExperimentalFTL())
+ numberOfThreads = 1; // We don't yet use LLVM in a thread-safe way.
+ else
+ numberOfThreads = Options::numberOfCompilerThreads();
+
+ theGlobalWorklist = Worklist::create(numberOfThreads).leakRef();
+ });
+
</ins><span class="cx"> return theGlobalWorklist;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeInitializeThreadingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/InitializeThreading.cpp (161145 => 161146)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/InitializeThreading.cpp 2013-12-30 18:45:37 UTC (rev 161145)
+++ trunk/Source/JavaScriptCore/runtime/InitializeThreading.cpp 2013-12-30 19:32:52 UTC (rev 161146)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> #include "JSLock.h"
</span><span class="cx"> #include "LLIntData.h"
</span><span class="cx"> #include "WriteBarrier.h"
</span><ins>+#include <mutex>
</ins><span class="cx"> #include <wtf/dtoa.h>
</span><span class="cx"> #include <wtf/Threading.h>
</span><span class="cx"> #include <wtf/dtoa/cached-powers.h>
</span><span class="lines">@@ -47,44 +48,31 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-#if OS(DARWIN)
-static pthread_once_t initializeThreadingKeyOnce = PTHREAD_ONCE_INIT;
-#endif
-
-static void initializeThreadingOnce()
</del><ins>+void initializeThreading()
</ins><span class="cx"> {
</span><del>- WTF::double_conversion::initialize();
- WTF::initializeThreading();
- GlobalJSLock::initialize();
- Options::initialize();
- if (Options::recordGCPauseTimes())
- HeapStatistics::initialize();
</del><ins>+ static std::once_flag initializeThreadingOnceFlag;
+
+ std::call_once(initializeThreadingOnceFlag, []{
+ WTF::double_conversion::initialize();
+ WTF::initializeThreading();
+ GlobalJSLock::initialize();
+ Options::initialize();
+ if (Options::recordGCPauseTimes())
+ HeapStatistics::initialize();
</ins><span class="cx"> #if ENABLE(WRITE_BARRIER_PROFILING)
</span><del>- WriteBarrierCounters::initialize();
</del><ins>+ WriteBarrierCounters::initialize();
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(ASSEMBLER)
</span><del>- ExecutableAllocator::initializeAllocator();
</del><ins>+ ExecutableAllocator::initializeAllocator();
</ins><span class="cx"> #endif
</span><del>- JSStack::initializeThreading();
</del><ins>+ JSStack::initializeThreading();
</ins><span class="cx"> #if ENABLE(LLINT)
</span><del>- LLInt::initialize();
</del><ins>+ LLInt::initialize();
</ins><span class="cx"> #endif
</span><span class="cx"> #ifndef NDEBUG
</span><del>- DisallowGC::initialize();
</del><ins>+ DisallowGC::initialize();
</ins><span class="cx"> #endif
</span><ins>+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void initializeThreading()
-{
-#if OS(DARWIN)
- pthread_once(&initializeThreadingKeyOnce, initializeThreadingOnce);
-#else
- static bool initializedThreading = false;
- if (!initializedThreading) {
- initializeThreadingOnce();
- initializedThreading = true;
- }
-#endif
-}
-
</del><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (161145 => 161146)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2013-12-30 18:45:37 UTC (rev 161145)
+++ trunk/Source/WTF/ChangeLog 2013-12-30 19:32:52 UTC (rev 161146)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2013-12-30 Anders Carlsson <andersca@apple.com>
+
+ Replace WTF::ThreadingOnce with std::call_once
+ https://bugs.webkit.org/show_bug.cgi?id=126215
+
+ Reviewed by Sam Weinig.
+
+ * GNUmakefile.list.am:
+ * wtf/CompilationThread.cpp:
+ (WTF::initializeCompilationThreads):
+ * wtf/ThreadingOnce.h: Removed.
+
</ins><span class="cx"> 2013-12-26 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Move FilterIterator and IteratorPair to WTF and reimplement HashMap::keys() and HashMap::values() using IteratorPair
</span></span></pre></div>
<a id="trunkSourceWTFGNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/GNUmakefile.list.am (161145 => 161146)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/GNUmakefile.list.am 2013-12-30 18:45:37 UTC (rev 161145)
+++ trunk/Source/WTF/GNUmakefile.list.am 2013-12-30 19:32:52 UTC (rev 161146)
</span><span class="lines">@@ -175,7 +175,6 @@
</span><span class="cx"> Source/WTF/wtf/ThreadSpecificWin.cpp \
</span><span class="cx"> Source/WTF/wtf/Threading.cpp \
</span><span class="cx"> Source/WTF/wtf/Threading.h \
</span><del>- Source/WTF/wtf/ThreadingOnce.h \
</del><span class="cx"> Source/WTF/wtf/ThreadingPrimitives.h \
</span><span class="cx"> Source/WTF/wtf/ThreadingPthreads.cpp \
</span><span class="cx"> Source/WTF/wtf/ThreadingWin.cpp \
</span></span></pre></div>
<a id="trunkSourceWTFwtfCompilationThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/CompilationThread.cpp (161145 => 161146)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/CompilationThread.cpp 2013-12-30 18:45:37 UTC (rev 161145)
+++ trunk/Source/WTF/wtf/CompilationThread.cpp 2013-12-30 19:32:52 UTC (rev 161146)
</span><span class="lines">@@ -29,21 +29,18 @@
</span><span class="cx"> #include "StdLibExtras.h"
</span><span class="cx"> #include "ThreadSpecific.h"
</span><span class="cx"> #include "Threading.h"
</span><del>-#include "ThreadingOnce.h"
</del><ins>+#include <mutex>
</ins><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><span class="cx"> static ThreadSpecific<bool>* s_isCompilationThread;
</span><span class="cx">
</span><del>-static void initializeCompilationThreadsOnce()
-{
- s_isCompilationThread = new ThreadSpecific<bool>();
-}
-
</del><span class="cx"> static void initializeCompilationThreads()
</span><span class="cx"> {
</span><del>- static ThreadingOnce initializeCompilationThreadsKeyOnce;
- initializeCompilationThreadsKeyOnce.callOnce(initializeCompilationThreadsOnce);
</del><ins>+ static std::once_flag initializeCompilationThreadsOnceFlag;
+ std::call_once(initializeCompilationThreadsOnceFlag, []{
+ s_isCompilationThread = new ThreadSpecific<bool>();
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool isCompilationThread()
</span></span></pre></div>
<a id="trunkSourceWTFwtfThreadingOnceh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WTF/wtf/ThreadingOnce.h (161145 => 161146)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/ThreadingOnce.h 2013-12-30 18:45:37 UTC (rev 161145)
+++ trunk/Source/WTF/wtf/ThreadingOnce.h 2013-12-30 19:32:52 UTC (rev 161146)
</span><span class="lines">@@ -1,74 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef ThreadingOnce_h
-#define ThreadingOnce_h
-
-#include <wtf/ThreadingPrimitives.h>
-
-namespace WTF {
-
-class ThreadingOnce {
- WTF_MAKE_NONCOPYABLE(ThreadingOnce);
-public:
- ThreadingOnce()
-#if USE(PTHREADS)
- : m_onceHandle(PTHREAD_ONCE_INIT)
-#else
- : m_calledOnce(false)
-#endif
- {
- }
-
- void callOnce(void (*initRoutine)())
- {
-#if USE(PTHREADS)
- pthread_once(&m_onceHandle, initRoutine);
-#else
- m_mutex.lock();
- if (!m_calledOnce) {
- initRoutine();
- m_calledOnce = true;
- }
- m_mutex.unlock();
-#endif
- }
-
-private:
-#if USE(PTHREADS)
- pthread_once_t m_onceHandle;
-#else
- Mutex m_mutex;
- bool m_calledOnce;
-#endif
-};
-
-} // namespace WTF
-
-#endif // ThreadingOnce_h
</del></span></pre>
</div>
</div>
</body>
</html>