<!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>[162935] 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/162935">162935</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-01-28 09:13:41 -0800 (Tue, 28 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use std::mutex instead of WTF::Mutex in WTF
https://bugs.webkit.org/show_bug.cgi?id=127783
Reviewed by Antti Koivisto.
* wtf/CryptographicallyRandomNumber.cpp:
* wtf/MainThread.cpp:
(WTF::mainThreadFunctionQueueMutex):
(WTF::functionQueue):
(WTF::dispatchFunctionsFromMainThread):
(WTF::callOnMainThread):
(WTF::cancelCallOnMainThread):
* wtf/StackStats.cpp:
(WTF::StackStats::initialize):
(WTF::StackStats::CheckPoint::CheckPoint):
(WTF::StackStats::CheckPoint::~CheckPoint):
(WTF::StackStats::probe):
(WTF::StackStats::LayoutCheckPoint::LayoutCheckPoint):
(WTF::StackStats::LayoutCheckPoint::~LayoutCheckPoint):
* wtf/StackStats.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfCryptographicallyRandomNumbercpp">trunk/Source/WTF/wtf/CryptographicallyRandomNumber.cpp</a></li>
<li><a href="#trunkSourceWTFwtfMainThreadcpp">trunk/Source/WTF/wtf/MainThread.cpp</a></li>
<li><a href="#trunkSourceWTFwtfStackStatscpp">trunk/Source/WTF/wtf/StackStats.cpp</a></li>
<li><a href="#trunkSourceWTFwtfStackStatsh">trunk/Source/WTF/wtf/StackStats.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (162934 => 162935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-01-28 17:07:38 UTC (rev 162934)
+++ trunk/Source/WTF/ChangeLog 2014-01-28 17:13:41 UTC (rev 162935)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-01-28 Anders Carlsson <andersca@apple.com>
+
+ Use std::mutex instead of WTF::Mutex in WTF
+ https://bugs.webkit.org/show_bug.cgi?id=127783
+
+ Reviewed by Antti Koivisto.
+
+ * wtf/CryptographicallyRandomNumber.cpp:
+ * wtf/MainThread.cpp:
+ (WTF::mainThreadFunctionQueueMutex):
+ (WTF::functionQueue):
+ (WTF::dispatchFunctionsFromMainThread):
+ (WTF::callOnMainThread):
+ (WTF::cancelCallOnMainThread):
+ * wtf/StackStats.cpp:
+ (WTF::StackStats::initialize):
+ (WTF::StackStats::CheckPoint::CheckPoint):
+ (WTF::StackStats::CheckPoint::~CheckPoint):
+ (WTF::StackStats::probe):
+ (WTF::StackStats::LayoutCheckPoint::LayoutCheckPoint):
+ (WTF::StackStats::LayoutCheckPoint::~LayoutCheckPoint):
+ * wtf/StackStats.h:
+
</ins><span class="cx"> 2014-01-27 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> WebCore: Enable -Wimplicit-fallthrough and add FALLTHROUGH annotation where needed
</span></span></pre></div>
<a id="trunkSourceWTFwtfCryptographicallyRandomNumbercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/CryptographicallyRandomNumber.cpp (162934 => 162935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/CryptographicallyRandomNumber.cpp 2014-01-28 17:07:38 UTC (rev 162934)
+++ trunk/Source/WTF/wtf/CryptographicallyRandomNumber.cpp 2014-01-28 17:13:41 UTC (rev 162935)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> #include "NeverDestroyed.h"
</span><span class="cx"> #include "OSRandomSource.h"
</span><del>-#include "ThreadingPrimitives.h"
</del><ins>+#include <mutex>
</ins><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">
</span><span class="cx"> ARC4Stream m_stream;
</span><span class="cx"> int m_count;
</span><del>- Mutex m_mutex;
</del><ins>+ std::mutex m_mutex;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> ARC4Stream::ARC4Stream()
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx">
</span><span class="cx"> uint32_t ARC4RandomNumberGenerator::randomNumber()
</span><span class="cx"> {
</span><del>- MutexLocker locker(m_mutex);
</del><ins>+ std::lock_guard<std::mutex> lock(m_mutex);
</ins><span class="cx">
</span><span class="cx"> m_count -= 4;
</span><span class="cx"> stirIfNeeded();
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx">
</span><span class="cx"> void ARC4RandomNumberGenerator::randomValues(void* buffer, size_t length)
</span><span class="cx"> {
</span><del>- MutexLocker locker(m_mutex);
</del><ins>+ std::lock_guard<std::mutex> lock(m_mutex);
</ins><span class="cx">
</span><span class="cx"> unsigned char* result = reinterpret_cast<unsigned char*>(buffer);
</span><span class="cx"> stirIfNeeded();
</span></span></pre></div>
<a id="trunkSourceWTFwtfMainThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/MainThread.cpp (162934 => 162935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/MainThread.cpp 2014-01-28 17:07:38 UTC (rev 162934)
+++ trunk/Source/WTF/wtf/MainThread.cpp 2014-01-28 17:13:41 UTC (rev 162935)
</span><span class="lines">@@ -33,7 +33,8 @@
</span><span class="cx"> #include "Deque.h"
</span><span class="cx"> #include "Functional.h"
</span><span class="cx"> #include "StdLibExtras.h"
</span><del>-#include "Threading.h"
</del><ins>+#include <mutex>
+#include <wtf/NeverDestroyed.h>
</ins><span class="cx"> #include <wtf/ThreadSpecific.h>
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="lines">@@ -68,16 +69,17 @@
</span><span class="cx"> static ThreadIdentifier mainThreadIdentifier;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-static Mutex& mainThreadFunctionQueueMutex()
</del><ins>+static std::mutex& mainThreadFunctionQueueMutex()
</ins><span class="cx"> {
</span><del>- DEFINE_STATIC_LOCAL(Mutex, staticMutex, ());
- return staticMutex;
</del><ins>+ static NeverDestroyed<std::mutex> mutex;
+
+ return mutex;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static FunctionQueue& functionQueue()
</span><span class="cx"> {
</span><del>- DEFINE_STATIC_LOCAL(FunctionQueue, staticFunctionQueue, ());
- return staticFunctionQueue;
</del><ins>+ static NeverDestroyed<FunctionQueue> functionQueue;
+ return functionQueue;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -154,7 +156,7 @@
</span><span class="cx"> FunctionWithContext invocation;
</span><span class="cx"> while (true) {
</span><span class="cx"> {
</span><del>- MutexLocker locker(mainThreadFunctionQueueMutex());
</del><ins>+ std::lock_guard<std::mutex> lock(mainThreadFunctionQueueMutex());
</ins><span class="cx"> if (!functionQueue().size())
</span><span class="cx"> break;
</span><span class="cx"> invocation = functionQueue().takeFirst();
</span><span class="lines">@@ -178,7 +180,7 @@
</span><span class="cx"> ASSERT(function);
</span><span class="cx"> bool needToSchedule = false;
</span><span class="cx"> {
</span><del>- MutexLocker locker(mainThreadFunctionQueueMutex());
</del><ins>+ std::lock_guard<std::mutex> lock(mainThreadFunctionQueueMutex());
</ins><span class="cx"> needToSchedule = functionQueue().size() == 0;
</span><span class="cx"> functionQueue().append(FunctionWithContext(function, context));
</span><span class="cx"> }
</span><span class="lines">@@ -190,7 +192,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(function);
</span><span class="cx">
</span><del>- MutexLocker locker(mainThreadFunctionQueueMutex());
</del><ins>+ std::lock_guard<std::mutex> lock(mainThreadFunctionQueueMutex());
</ins><span class="cx">
</span><span class="cx"> FunctionWithContextFinder pred(FunctionWithContext(function, context));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfStackStatscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/StackStats.cpp (162934 => 162935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/StackStats.cpp 2014-01-28 17:07:38 UTC (rev 162934)
+++ trunk/Source/WTF/wtf/StackStats.cpp 2014-01-28 17:13:41 UTC (rev 162935)
</span><span class="lines">@@ -36,13 +36,13 @@
</span><span class="cx"> // checkpoint. By default, we only log checkpoints that establish new
</span><span class="cx"> // max values.
</span><span class="cx">
</span><del>-// #define ENABLE_VERBOSE_STACK_STATS 1
</del><ins>+#define ENABLE_VERBOSE_STACK_STATS 1
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><span class="cx"> // CheckPoint management:
</span><del>-Mutex* StackStats::s_sharedLock = 0;
</del><ins>+std::mutex* StackStats::s_sharedMutex = 0;
</ins><span class="cx"> StackStats::CheckPoint* StackStats::s_topCheckPoint = 0;
</span><span class="cx"> StackStats::LayoutCheckPoint* StackStats::s_firstLayoutCheckPoint = 0;
</span><span class="cx"> StackStats::LayoutCheckPoint* StackStats::s_topLayoutCheckPoint = 0;
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> // Initializes locks and the log. Should only be called once.
</span><span class="cx"> void StackStats::initialize()
</span><span class="cx"> {
</span><del>- s_sharedLock = new Mutex();
</del><ins>+ s_sharedMutex = std::make_unique<std::mutex>().release();
</ins><span class="cx"> dataLogF(" === LOG new stack stats ========\n");
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">
</span><span class="cx"> StackStats::CheckPoint::CheckPoint()
</span><span class="cx"> {
</span><del>- MutexLocker locker(*StackStats::s_sharedLock);
</del><ins>+ std::lock_guard<std::mutex> lock(*StackStats::s_sharedMutex);
</ins><span class="cx"> WTFThreadData* threadData = const_cast<WTFThreadData*>(&wtfThreadData());
</span><span class="cx"> StackStats::PerThreadStats& t = threadData->stackStats();
</span><span class="cx"> const StackBounds& stack = threadData->stack();
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx">
</span><span class="cx"> StackStats::CheckPoint::~CheckPoint()
</span><span class="cx"> {
</span><del>- MutexLocker locker(*StackStats::s_sharedLock);
</del><ins>+ std::lock_guard<std::mutex> lock(*StackStats::s_sharedMutex);
</ins><span class="cx"> WTFThreadData* threadData = const_cast<WTFThreadData*>(&wtfThreadData());
</span><span class="cx"> StackStats::PerThreadStats& t = threadData->stackStats();
</span><span class="cx">
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx">
</span><span class="cx"> void StackStats::probe()
</span><span class="cx"> {
</span><del>- MutexLocker locker(*StackStats::s_sharedLock);
</del><ins>+ std::lock_guard<std::mutex> lock(*StackStats::s_sharedMutex);
</ins><span class="cx"> WTFThreadData* threadData = const_cast<WTFThreadData*>(&wtfThreadData());
</span><span class="cx"> StackStats::PerThreadStats& t = threadData->stackStats();
</span><span class="cx"> const StackBounds& stack = threadData->stack();
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx"> // probe first, we can avoid re-entering the lock.
</span><span class="cx"> StackStats::probe();
</span><span class="cx">
</span><del>- MutexLocker locker(*StackStats::s_sharedLock);
</del><ins>+ std::lock_guard<std::mutex> lock(*StackStats::s_sharedMutex);
</ins><span class="cx"> WTFThreadData* threadData = const_cast<WTFThreadData*>(&wtfThreadData());
</span><span class="cx"> StackStats::PerThreadStats& t = threadData->stackStats();
</span><span class="cx"> const StackBounds& stack = threadData->stack();
</span><span class="lines">@@ -295,7 +295,7 @@
</span><span class="cx">
</span><span class="cx"> StackStats::LayoutCheckPoint::~LayoutCheckPoint()
</span><span class="cx"> {
</span><del>- MutexLocker locker(*StackStats::s_sharedLock);
</del><ins>+ std::lock_guard<std::mutex> lock(*StackStats::s_sharedMutex);
</ins><span class="cx">
</span><span class="cx"> // Pop to the previous layout checkpoint:
</span><span class="cx"> StackStats::s_topLayoutCheckPoint = m_prev;
</span></span></pre></div>
<a id="trunkSourceWTFwtfStackStatsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/StackStats.h (162934 => 162935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/StackStats.h 2014-01-28 17:07:38 UTC (rev 162934)
+++ trunk/Source/WTF/wtf/StackStats.h 2014-01-28 17:13:41 UTC (rev 162935)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #define StackStats_h
</span><span class="cx">
</span><span class="cx"> #include "ExportMacros.h"
</span><del>-#include "ThreadingPrimitives.h"
</del><ins>+#include <mutex>
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> // Define this flag to enable Stack stats collection. This feature is useful
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> // convenience for collecting that data. It is not meant to be enabled by
</span><span class="cx"> // default on release or debug builds.
</span><span class="cx">
</span><del>-// #define ENABLE_STACK_STATS 1
</del><ins>+#define ENABLE_STACK_STATS 1
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> // CheckPoint management:
</span><del>- static Mutex* s_sharedLock;
</del><ins>+ static std::mutex* s_sharedMutex;
</ins><span class="cx"> static CheckPoint* s_topCheckPoint;
</span><span class="cx"> static LayoutCheckPoint* s_firstLayoutCheckPoint;
</span><span class="cx"> static LayoutCheckPoint* s_topLayoutCheckPoint;
</span></span></pre>
</div>
</div>
</body>
</html>