<!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>[162777] 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/162777">162777</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-01-25 13:16:42 -0800 (Sat, 25 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove atomicIncrement/atomicDecrement
https://bugs.webkit.org/show_bug.cgi?id=127625
Reviewed by Andreas Kling.
Replace atomicIncrement/atomicDecrement with std::atomic.
Source/JavaScriptCore:
* bytecode/Watchpoint.h:
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::LowerDFGToLLVM::lower):
* profiler/ProfilerDatabase.cpp:
(JSC::Profiler::Database::Database):
(JSC::Profiler::Database::addDatabaseToAtExit):
Source/WebCore:
* Modules/webaudio/AudioContext.cpp:
(WebCore::AudioContext::incrementActiveSourceCount):
(WebCore::AudioContext::decrementActiveSourceCount):
* Modules/webaudio/AudioContext.h:
* Modules/webaudio/AudioNode.cpp:
(WebCore::AudioNode::~AudioNode):
(WebCore::AudioNode::ref):
(WebCore::AudioNode::finishDeref):
* Modules/webaudio/AudioNode.h:
* Modules/webdatabase/OriginLock.h:
Source/WebKit2:
* Platform/IPC/Connection.cpp:
(IPC::Connection::createSyncMessageEncoder):
* Shared/mac/SecItemShim.cpp:
(WebKit::generateSecItemRequestID):
* UIProcess/StatisticsRequest.cpp:
(WebKit::StatisticsRequest::addOutstandingRequest):
Source/WTF:
* wtf/Atomics.h:
* wtf/RefCountedLeakCounter.cpp:
(WTF::RefCountedLeakCounter::~RefCountedLeakCounter):
(WTF::RefCountedLeakCounter::increment):
(WTF::RefCountedLeakCounter::decrement):
* wtf/RefCountedLeakCounter.h:
* wtf/ThreadSafeRefCounted.h:
(WTF::ThreadSafeRefCountedBase::ref):
(WTF::ThreadSafeRefCountedBase::refCount):
(WTF::ThreadSafeRefCountedBase::derefBase):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeWatchpointh">trunk/Source/JavaScriptCore/bytecode/Watchpoint.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreprofilerProfilerDatabasecpp">trunk/Source/JavaScriptCore/profiler/ProfilerDatabase.cpp</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfAtomicsh">trunk/Source/WTF/wtf/Atomics.h</a></li>
<li><a href="#trunkSourceWTFwtfRefCountedLeakCountercpp">trunk/Source/WTF/wtf/RefCountedLeakCounter.cpp</a></li>
<li><a href="#trunkSourceWTFwtfRefCountedLeakCounterh">trunk/Source/WTF/wtf/RefCountedLeakCounter.h</a></li>
<li><a href="#trunkSourceWTFwtfThreadSafeRefCountedh">trunk/Source/WTF/wtf/ThreadSafeRefCounted.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioAudioContextcpp">trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioAudioContexth">trunk/Source/WebCore/Modules/webaudio/AudioContext.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioAudioNodecpp">trunk/Source/WebCore/Modules/webaudio/AudioNode.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioAudioNodeh">trunk/Source/WebCore/Modules/webaudio/AudioNode.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseOriginLockh">trunk/Source/WebCore/Modules/webdatabase/OriginLock.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCConnectioncpp">trunk/Source/WebKit2/Platform/IPC/Connection.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedmacSecItemShimcpp">trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStatisticsRequestcpp">trunk/Source/WebKit2/UIProcess/StatisticsRequest.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (162776 => 162777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-01-25 20:49:23 UTC (rev 162776)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-01-25 21:16:42 UTC (rev 162777)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-01-25 Anders Carlsson <andersca@apple.com>
+
+ Remove atomicIncrement/atomicDecrement
+ https://bugs.webkit.org/show_bug.cgi?id=127625
+
+ Reviewed by Andreas Kling.
+
+ Replace atomicIncrement/atomicDecrement with std::atomic.
+
+ * bytecode/Watchpoint.h:
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::LowerDFGToLLVM::lower):
+ * profiler/ProfilerDatabase.cpp:
+ (JSC::Profiler::Database::Database):
+ (JSC::Profiler::Database::addDatabaseToAtExit):
+
</ins><span class="cx"> 2014-01-24 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Move InspectorRuntimeAgent into JavaScriptCore
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeWatchpointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/Watchpoint.h (162776 => 162777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/Watchpoint.h 2014-01-25 20:49:23 UTC (rev 162776)
+++ trunk/Source/JavaScriptCore/bytecode/Watchpoint.h 2014-01-25 21:16:42 UTC (rev 162777)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #ifndef Watchpoint_h
</span><span class="cx"> #define Watchpoint_h
</span><span class="cx">
</span><ins>+#include <wtf/Atomics.h>
</ins><span class="cx"> #include <wtf/SentinelLinkedList.h>
</span><span class="cx"> #include <wtf/ThreadSafeRefCounted.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (162776 => 162777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2014-01-25 20:49:23 UTC (rev 162776)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2014-01-25 21:16:42 UTC (rev 162777)
</span><span class="lines">@@ -42,14 +42,14 @@
</span><span class="cx"> #include "OperandsInlines.h"
</span><span class="cx"> #include "Operations.h"
</span><span class="cx"> #include "VirtualRegister.h"
</span><del>-
</del><ins>+#include <atomic>
</ins><span class="cx"> #include <wtf/ProcessID.h>
</span><span class="cx">
</span><span class="cx"> namespace JSC { namespace FTL {
</span><span class="cx">
</span><span class="cx"> using namespace DFG;
</span><span class="cx">
</span><del>-static int compileCounter;
</del><ins>+static std::atomic<int> compileCounter;
</ins><span class="cx">
</span><span class="cx"> // Using this instead of typeCheck() helps to reduce the load on LLVM, by creating
</span><span class="cx"> // significantly less dead code.
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> CString name;
</span><span class="cx"> if (verboseCompilationEnabled()) {
</span><span class="cx"> name = toCString(
</span><del>- "jsBody_", atomicIncrement(&compileCounter), "_", codeBlock()->inferredName(),
</del><ins>+ "jsBody_", ++compileCounter, "_", codeBlock()->inferredName(),
</ins><span class="cx"> "_", codeBlock()->hash());
</span><span class="cx"> } else
</span><span class="cx"> name = "jsBody";
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreprofilerProfilerDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/profiler/ProfilerDatabase.cpp (162776 => 162777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/profiler/ProfilerDatabase.cpp 2014-01-25 20:49:23 UTC (rev 162776)
+++ trunk/Source/JavaScriptCore/profiler/ProfilerDatabase.cpp 2014-01-25 21:16:42 UTC (rev 162777)
</span><span class="lines">@@ -33,17 +33,14 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC { namespace Profiler {
</span><span class="cx">
</span><del>-#if COMPILER(MINGW) || COMPILER(MSVC7_OR_LOWER) || OS(WINCE)
-static int databaseCounter;
-#else
-static volatile int databaseCounter;
-#endif
</del><ins>+static std::atomic<int> databaseCounter;
+
</ins><span class="cx"> static SpinLock registrationLock = SPINLOCK_INITIALIZER;
</span><del>-static int didRegisterAtExit;
</del><ins>+static std::atomic<int> didRegisterAtExit;
</ins><span class="cx"> static Database* firstDatabase;
</span><span class="cx">
</span><span class="cx"> Database::Database(VM& vm)
</span><del>- : m_databaseID(atomicIncrement(&databaseCounter))
</del><ins>+ : m_databaseID(++databaseCounter)
</ins><span class="cx"> , m_vm(vm)
</span><span class="cx"> , m_shouldSaveAtExit(false)
</span><span class="cx"> , m_nextRegisteredDatabase(0)
</span><span class="lines">@@ -138,7 +135,7 @@
</span><span class="cx">
</span><span class="cx"> void Database::addDatabaseToAtExit()
</span><span class="cx"> {
</span><del>- if (atomicIncrement(&didRegisterAtExit) == 1)
</del><ins>+ if (++didRegisterAtExit == 1)
</ins><span class="cx"> atexit(atExitCallback);
</span><span class="cx">
</span><span class="cx"> TCMalloc_SpinLockHolder holder(&registrationLock);
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (162776 => 162777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-01-25 20:49:23 UTC (rev 162776)
+++ trunk/Source/WTF/ChangeLog 2014-01-25 21:16:42 UTC (rev 162777)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2014-01-25 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Remove atomicIncrement/atomicDecrement
+ https://bugs.webkit.org/show_bug.cgi?id=127625
+
+ Reviewed by Andreas Kling.
+
+ Replace atomicIncrement/atomicDecrement with std::atomic.
+
+ * wtf/Atomics.h:
+ * wtf/RefCountedLeakCounter.cpp:
+ (WTF::RefCountedLeakCounter::~RefCountedLeakCounter):
+ (WTF::RefCountedLeakCounter::increment):
+ (WTF::RefCountedLeakCounter::decrement):
+ * wtf/RefCountedLeakCounter.h:
+ * wtf/ThreadSafeRefCounted.h:
+ (WTF::ThreadSafeRefCountedBase::ref):
+ (WTF::ThreadSafeRefCountedBase::refCount):
+ (WTF::ThreadSafeRefCountedBase::derefBase):
+
+2014-01-25 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Modernize HashTable threading code
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=127621
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfAtomicsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Atomics.h (162776 => 162777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Atomics.h 2014-01-25 20:49:23 UTC (rev 162776)
+++ trunk/Source/WTF/wtf/Atomics.h 2014-01-25 21:16:42 UTC (rev 162777)
</span><span class="lines">@@ -73,35 +73,6 @@
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><span class="cx"> #if OS(WINDOWS)
</span><del>-
-#if OS(WINCE)
-inline int atomicIncrement(int* addend) { return InterlockedIncrement(reinterpret_cast<long*>(addend)); }
-inline int atomicDecrement(int* addend) { return InterlockedDecrement(reinterpret_cast<long*>(addend)); }
-#elif COMPILER(MINGW)
-inline int atomicIncrement(int* addend) { return InterlockedIncrement(reinterpret_cast<long*>(addend)); }
-inline int atomicDecrement(int* addend) { return InterlockedDecrement(reinterpret_cast<long*>(addend)); }
-
-inline int64_t atomicIncrement(int64_t* addend) { return InterlockedIncrement64(reinterpret_cast<long long*>(addend)); }
-inline int64_t atomicDecrement(int64_t* addend) { return InterlockedDecrement64(reinterpret_cast<long long*>(addend)); }
-#else
-inline int atomicIncrement(int volatile* addend) { return InterlockedIncrement(reinterpret_cast<long volatile*>(addend)); }
-inline int atomicDecrement(int volatile* addend) { return InterlockedDecrement(reinterpret_cast<long volatile*>(addend)); }
-
-inline int64_t atomicIncrement(int64_t volatile* addend) { return InterlockedIncrement64(reinterpret_cast<long long volatile*>(addend)); }
-inline int64_t atomicDecrement(int64_t volatile* addend) { return InterlockedDecrement64(reinterpret_cast<long long volatile*>(addend)); }
-#endif
-
-#elif COMPILER(GCC)
-
-inline int atomicIncrement(int volatile* addend) { return __sync_add_and_fetch(addend, 1); }
-inline int atomicDecrement(int volatile* addend) { return __sync_sub_and_fetch(addend, 1); }
-
-inline int64_t atomicIncrement(int64_t volatile* addend) { return __sync_add_and_fetch(addend, 1); }
-inline int64_t atomicDecrement(int64_t volatile* addend) { return __sync_sub_and_fetch(addend, 1); }
-
-#endif
-
-#if OS(WINDOWS)
</del><span class="cx"> inline bool weakCompareAndSwap(volatile unsigned* location, unsigned expected, unsigned newValue)
</span><span class="cx"> {
</span><span class="cx"> #if OS(WINCE)
</span><span class="lines">@@ -343,7 +314,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WTF
</span><span class="cx">
</span><del>-using WTF::atomicDecrement;
-using WTF::atomicIncrement;
-
</del><span class="cx"> #endif // Atomics_h
</span></span></pre></div>
<a id="trunkSourceWTFwtfRefCountedLeakCountercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/RefCountedLeakCounter.cpp (162776 => 162777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/RefCountedLeakCounter.cpp 2014-01-25 20:49:23 UTC (rev 162776)
+++ trunk/Source/WTF/wtf/RefCountedLeakCounter.cpp 2014-01-25 21:16:42 UTC (rev 162777)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> static bool loggedSuppressionReason;
</span><span class="cx"> if (m_count) {
</span><span class="cx"> if (!leakMessageSuppressionReasons || leakMessageSuppressionReasons->isEmpty())
</span><del>- LOG(RefCountedLeaks, "LEAK: %u %s", m_count, m_description);
</del><ins>+ LOG(RefCountedLeaks, "LEAK: %u %s", m_count.load(), m_description);
</ins><span class="cx"> else if (!loggedSuppressionReason) {
</span><span class="cx"> // This logs only one reason. Later we could change it so we log all the reasons.
</span><span class="cx"> LOG(RefCountedLeaks, "No leak checking done: %s", leakMessageSuppressionReasons->begin()->key);
</span><span class="lines">@@ -79,12 +79,12 @@
</span><span class="cx">
</span><span class="cx"> void RefCountedLeakCounter::increment()
</span><span class="cx"> {
</span><del>- atomicIncrement(&m_count);
</del><ins>+ ++m_count;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RefCountedLeakCounter::decrement()
</span><span class="cx"> {
</span><del>- atomicDecrement(&m_count);
</del><ins>+ --m_count;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWTFwtfRefCountedLeakCounterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/RefCountedLeakCounter.h (162776 => 162777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/RefCountedLeakCounter.h 2014-01-25 20:49:23 UTC (rev 162776)
+++ trunk/Source/WTF/wtf/RefCountedLeakCounter.h 2014-01-25 21:16:42 UTC (rev 162777)
</span><span class="lines">@@ -20,32 +20,28 @@
</span><span class="cx">
</span><span class="cx"> #ifndef RefCountedLeakCounter_h
</span><span class="cx"> #define RefCountedLeakCounter_h
</span><del>-
</del><ins>+
+#include <atomic>
</ins><span class="cx"> #include <wtf/Assertions.h>
</span><del>-#include <wtf/Threading.h>
</del><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><del>- struct RefCountedLeakCounter {
- WTF_EXPORT_PRIVATE static void suppressMessages(const char*);
- WTF_EXPORT_PRIVATE static void cancelMessageSuppression(const char*);
-
- WTF_EXPORT_PRIVATE explicit RefCountedLeakCounter(const char* description);
- WTF_EXPORT_PRIVATE ~RefCountedLeakCounter();
</del><ins>+struct RefCountedLeakCounter {
+ WTF_EXPORT_PRIVATE static void suppressMessages(const char*);
+ WTF_EXPORT_PRIVATE static void cancelMessageSuppression(const char*);
+
+ WTF_EXPORT_PRIVATE explicit RefCountedLeakCounter(const char* description);
+ WTF_EXPORT_PRIVATE ~RefCountedLeakCounter();
</ins><span class="cx">
</span><del>- WTF_EXPORT_PRIVATE void increment();
- WTF_EXPORT_PRIVATE void decrement();
</del><ins>+ WTF_EXPORT_PRIVATE void increment();
+ WTF_EXPORT_PRIVATE void decrement();
</ins><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><del>- private:
-#if COMPILER(MINGW) || OS(WINCE)
- int m_count;
-#else
- volatile int m_count;
</del><ins>+private:
+ std::atomic<int> m_count;
+ const char* m_description;
</ins><span class="cx"> #endif
</span><del>- const char* m_description;
-#endif
- };
</del><ins>+};
</ins><span class="cx">
</span><span class="cx"> } // namespace WTF
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfThreadSafeRefCountedh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/ThreadSafeRefCounted.h (162776 => 162777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/ThreadSafeRefCounted.h 2014-01-25 20:49:23 UTC (rev 162776)
+++ trunk/Source/WTF/wtf/ThreadSafeRefCounted.h 2014-01-25 21:16:42 UTC (rev 162777)
</span><span class="lines">@@ -59,11 +59,9 @@
</span><span class="cx"> #ifndef ThreadSafeRefCounted_h
</span><span class="cx"> #define ThreadSafeRefCounted_h
</span><span class="cx">
</span><del>-#include <wtf/Platform.h>
-
-#include <wtf/Atomics.h>
</del><ins>+#include <atomic>
</ins><span class="cx"> #include <wtf/DynamicAnnotations.h>
</span><del>-#include <wtf/ThreadingPrimitives.h>
</del><ins>+#include <wtf/Noncopyable.h>
</ins><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><span class="lines">@@ -78,7 +76,7 @@
</span><span class="cx">
</span><span class="cx"> void ref()
</span><span class="cx"> {
</span><del>- atomicIncrement(&m_refCount);
</del><ins>+ ++m_refCount;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool hasOneRef()
</span><span class="lines">@@ -88,7 +86,7 @@
</span><span class="cx">
</span><span class="cx"> int refCount() const
</span><span class="cx"> {
</span><del>- return static_cast<int const volatile&>(m_refCount);
</del><ins>+ return m_refCount;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="lines">@@ -96,7 +94,7 @@
</span><span class="cx"> bool derefBase()
</span><span class="cx"> {
</span><span class="cx"> WTF_ANNOTATE_HAPPENS_BEFORE(&m_refCount);
</span><del>- if (atomicDecrement(&m_refCount) <= 0) {
</del><ins>+ if (--m_refCount <= 0) {
</ins><span class="cx"> WTF_ANNOTATE_HAPPENS_AFTER(&m_refCount);
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -105,7 +103,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- int m_refCount;
</del><ins>+ std::atomic<int> m_refCount;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<class T> class ThreadSafeRefCounted : public ThreadSafeRefCountedBase {
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162776 => 162777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-25 20:49:23 UTC (rev 162776)
+++ trunk/Source/WebCore/ChangeLog 2014-01-25 21:16:42 UTC (rev 162777)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-01-25 Anders Carlsson <andersca@apple.com>
+
+ Remove atomicIncrement/atomicDecrement
+ https://bugs.webkit.org/show_bug.cgi?id=127625
+
+ Reviewed by Andreas Kling.
+
+ Replace atomicIncrement/atomicDecrement with std::atomic.
+
+ * Modules/webaudio/AudioContext.cpp:
+ (WebCore::AudioContext::incrementActiveSourceCount):
+ (WebCore::AudioContext::decrementActiveSourceCount):
+ * Modules/webaudio/AudioContext.h:
+ * Modules/webaudio/AudioNode.cpp:
+ (WebCore::AudioNode::~AudioNode):
+ (WebCore::AudioNode::ref):
+ (WebCore::AudioNode::finishDeref):
+ * Modules/webaudio/AudioNode.h:
+ * Modules/webdatabase/OriginLock.h:
+
</ins><span class="cx"> 2014-01-25 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed build fix for WinCairo.
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioAudioContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp (162776 => 162777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp 2014-01-25 20:49:23 UTC (rev 162776)
+++ trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp 2014-01-25 21:16:42 UTC (rev 162777)
</span><span class="lines">@@ -1001,12 +1001,12 @@
</span><span class="cx">
</span><span class="cx"> void AudioContext::incrementActiveSourceCount()
</span><span class="cx"> {
</span><del>- atomicIncrement(&m_activeSourceCount);
</del><ins>+ ++m_activeSourceCount;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AudioContext::decrementActiveSourceCount()
</span><span class="cx"> {
</span><del>- atomicDecrement(&m_activeSourceCount);
</del><ins>+ --m_activeSourceCount;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioAudioContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/AudioContext.h (162776 => 162777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/AudioContext.h 2014-01-25 20:49:23 UTC (rev 162776)
+++ trunk/Source/WebCore/Modules/webaudio/AudioContext.h 2014-01-25 21:16:42 UTC (rev 162777)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "EventListener.h"
</span><span class="cx"> #include "EventTarget.h"
</span><span class="cx"> #include "MediaCanStartListener.h"
</span><ins>+#include <atomic>
</ins><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="lines">@@ -361,7 +362,7 @@
</span><span class="cx"> enum { MaxNumberOfChannels = 32 };
</span><span class="cx">
</span><span class="cx"> // Number of AudioBufferSourceNodes that are active (playing).
</span><del>- int m_activeSourceCount;
</del><ins>+ std::atomic<int> m_activeSourceCount;
</ins><span class="cx">
</span><span class="cx"> BehaviorRestrictions m_restrictions;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioAudioNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/AudioNode.cpp (162776 => 162777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/AudioNode.cpp 2014-01-25 20:49:23 UTC (rev 162776)
+++ trunk/Source/WebCore/Modules/webaudio/AudioNode.cpp 2014-01-25 21:16:42 UTC (rev 162777)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> {
</span><span class="cx"> #if DEBUG_AUDIONODE_REFERENCES
</span><span class="cx"> --s_nodeCount[nodeType()];
</span><del>- fprintf(stderr, "%p: %d: AudioNode::~AudioNode() %d %d\n", this, nodeType(), m_normalRefCount, m_connectionRefCount);
</del><ins>+ fprintf(stderr, "%p: %d: AudioNode::~AudioNode() %d %d\n", this, nodeType(), m_normalRefCount.load(), m_connectionRefCount);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -411,10 +411,10 @@
</span><span class="cx"> {
</span><span class="cx"> switch (refType) {
</span><span class="cx"> case RefTypeNormal:
</span><del>- atomicIncrement(&m_normalRefCount);
</del><ins>+ ++m_normalRefCount;
</ins><span class="cx"> break;
</span><span class="cx"> case RefTypeConnection:
</span><del>- atomicIncrement(&m_connectionRefCount);
</del><ins>+ ++m_connectionRefCount;
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="lines">@@ -473,11 +473,11 @@
</span><span class="cx"> switch (refType) {
</span><span class="cx"> case RefTypeNormal:
</span><span class="cx"> ASSERT(m_normalRefCount > 0);
</span><del>- atomicDecrement(&m_normalRefCount);
</del><ins>+ --m_normalRefCount;
</ins><span class="cx"> break;
</span><span class="cx"> case RefTypeConnection:
</span><span class="cx"> ASSERT(m_connectionRefCount > 0);
</span><del>- atomicDecrement(&m_connectionRefCount);
</del><ins>+ --m_connectionRefCount;
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioAudioNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/AudioNode.h (162776 => 162777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/AudioNode.h 2014-01-25 20:49:23 UTC (rev 162776)
+++ trunk/Source/WebCore/Modules/webaudio/AudioNode.h 2014-01-25 21:16:42 UTC (rev 162777)
</span><span class="lines">@@ -207,8 +207,8 @@
</span><span class="cx"> double m_lastNonSilentTime;
</span><span class="cx">
</span><span class="cx"> // Ref-counting
</span><del>- volatile int m_normalRefCount;
- volatile int m_connectionRefCount;
</del><ins>+ std::atomic<int> m_normalRefCount;
+ std::atomic<int> m_connectionRefCount;
</ins><span class="cx">
</span><span class="cx"> bool m_isMarkedForDeletion;
</span><span class="cx"> bool m_isDisabled;
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseOriginLockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/OriginLock.h (162776 => 162777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/OriginLock.h 2014-01-25 20:49:23 UTC (rev 162776)
+++ trunk/Source/WebCore/Modules/webdatabase/OriginLock.h 2014-01-25 21:16:42 UTC (rev 162777)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include "FileSystem.h"
</span><span class="cx"> #include <wtf/ThreadSafeRefCounted.h>
</span><ins>+#include <wtf/ThreadingPrimitives.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (162776 => 162777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-25 20:49:23 UTC (rev 162776)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-25 21:16:42 UTC (rev 162777)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2014-01-25 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Remove atomicIncrement/atomicDecrement
+ https://bugs.webkit.org/show_bug.cgi?id=127625
+
+ Reviewed by Andreas Kling.
+
+ Replace atomicIncrement/atomicDecrement with std::atomic.
+
+ * Platform/IPC/Connection.cpp:
+ (IPC::Connection::createSyncMessageEncoder):
+ * Shared/mac/SecItemShim.cpp:
+ (WebKit::generateSecItemRequestID):
+ * UIProcess/StatisticsRequest.cpp:
+ (WebKit::StatisticsRequest::addOutstandingRequest):
+
+2014-01-25 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Modernize HashTable threading code
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=127621
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/Connection.cpp (162776 => 162777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/Connection.cpp 2014-01-25 20:49:23 UTC (rev 162776)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.cpp 2014-01-25 21:16:42 UTC (rev 162777)
</span><span class="lines">@@ -344,7 +344,6 @@
</span><span class="cx"> encoder->setIsSyncMessage(true);
</span><span class="cx">
</span><span class="cx"> // Encode the sync request ID.
</span><del>- COMPILE_ASSERT(sizeof(m_syncRequestID) == sizeof(int64_t), CanUseAtomicIncrement);
</del><span class="cx"> syncRequestID = ++m_syncRequestID;
</span><span class="cx"> *encoder << syncRequestID;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacSecItemShimcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp (162776 => 162777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp 2014-01-25 20:49:23 UTC (rev 162776)
+++ trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp 2014-01-25 21:16:42 UTC (rev 162777)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #include "SecItemShimMessages.h"
</span><span class="cx"> #include "SecItemShimProxyMessages.h"
</span><span class="cx"> #include <Security/Security.h>
</span><ins>+#include <atomic>
</ins><span class="cx"> #include <dlfcn.h>
</span><span class="cx"> #include <mutex>
</span><span class="cx">
</span><span class="lines">@@ -73,8 +74,8 @@
</span><span class="cx">
</span><span class="cx"> static uint64_t generateSecItemRequestID()
</span><span class="cx"> {
</span><del>- static int64_t uniqueSecItemRequestID;
- return atomicIncrement(&uniqueSecItemRequestID);
</del><ins>+ static std::atomic<int64_t> uniqueSecItemRequestID;
+ return ++uniqueSecItemRequestID;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static std::unique_ptr<SecItemResponseData> sendSecItemRequest(SecItemRequestData::Type requestType, CFDictionaryRef query, CFDictionaryRef attributesToMatch = 0)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStatisticsRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/StatisticsRequest.cpp (162776 => 162777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/StatisticsRequest.cpp 2014-01-25 20:49:23 UTC (rev 162776)
+++ trunk/Source/WebKit2/UIProcess/StatisticsRequest.cpp 2014-01-25 21:16:42 UTC (rev 162777)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><span class="cx"> #include "MutableDictionary.h"
</span><del>-#include <wtf/Atomics.h>
</del><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="lines">@@ -45,9 +44,9 @@
</span><span class="cx">
</span><span class="cx"> uint64_t StatisticsRequest::addOutstandingRequest()
</span><span class="cx"> {
</span><del>- static int64_t uniqueRequestID;
</del><ins>+ static std::atomic<int64_t> uniqueRequestID;
</ins><span class="cx">
</span><del>- uint64_t requestID = atomicIncrement(&uniqueRequestID);
</del><ins>+ uint64_t requestID = ++uniqueRequestID;
</ins><span class="cx"> m_outstandingRequests.add(requestID);
</span><span class="cx"> return requestID;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>