<!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>[160959] 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/160959">160959</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2013-12-20 21:23:10 -0800 (Fri, 20 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Replace yield() and pauseBriefly() with std::this_thread::yield()
https://bugs.webkit.org/show_bug.cgi?id=126105
Reviewed by Sam Weinig.
Source/WebCore:
* platform/sql/SQLiteDatabase.cpp:
(WebCore::SQLiteDatabase::interrupt):
Source/WTF:
* wtf/ByteSpinLock.h:
(WTF::ByteSpinLock::lock):
* wtf/Threading.h:
* wtf/ThreadingPrimitives.h:
* wtf/ThreadingPthreads.cpp:
* wtf/ThreadingWin.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfByteSpinLockh">trunk/Source/WTF/wtf/ByteSpinLock.h</a></li>
<li><a href="#trunkSourceWTFwtfThreadingh">trunk/Source/WTF/wtf/Threading.h</a></li>
<li><a href="#trunkSourceWTFwtfThreadingPrimitivesh">trunk/Source/WTF/wtf/ThreadingPrimitives.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>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformsqlSQLiteDatabasecpp">trunk/Source/WebCore/platform/sql/SQLiteDatabase.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (160958 => 160959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2013-12-21 04:58:15 UTC (rev 160958)
+++ trunk/Source/WTF/ChangeLog 2013-12-21 05:23:10 UTC (rev 160959)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2013-12-20 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Replace yield() and pauseBriefly() with std::this_thread::yield()
+ https://bugs.webkit.org/show_bug.cgi?id=126105
+
+ Reviewed by Sam Weinig.
+
+ * wtf/ByteSpinLock.h:
+ (WTF::ByteSpinLock::lock):
+ * wtf/Threading.h:
+ * wtf/ThreadingPrimitives.h:
+ * wtf/ThreadingPthreads.cpp:
+ * wtf/ThreadingWin.cpp:
+
+2013-12-20 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Speed up case folding for 8-bit strings
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126098
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfByteSpinLockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/ByteSpinLock.h (160958 => 160959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/ByteSpinLock.h 2013-12-21 04:58:15 UTC (rev 160958)
+++ trunk/Source/WTF/wtf/ByteSpinLock.h 2013-12-21 05:23:10 UTC (rev 160959)
</span><span class="lines">@@ -26,11 +26,11 @@
</span><span class="cx"> #ifndef ByteSpinLock_h
</span><span class="cx"> #define ByteSpinLock_h
</span><span class="cx">
</span><ins>+#include <thread>
</ins><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/Atomics.h>
</span><span class="cx"> #include <wtf/Locker.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><del>-#include <wtf/ThreadingPrimitives.h>
</del><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> void lock()
</span><span class="cx"> {
</span><span class="cx"> while (!weakCompareAndSwap(&m_lock, 0, 1))
</span><del>- pauseBriefly();
</del><ins>+ std::this_thread::yield();
</ins><span class="cx"> memoryBarrierAfterLock();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfThreadingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Threading.h (160958 => 160959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Threading.h 2013-12-21 04:58:15 UTC (rev 160958)
+++ trunk/Source/WTF/wtf/Threading.h 2013-12-21 05:23:10 UTC (rev 160959)
</span><span class="lines">@@ -100,8 +100,6 @@
</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><del>-WTF_EXPORT_PRIVATE void yield();
-
</del><span class="cx"> WTF_EXPORT_PRIVATE void lockAtomicallyInitializedStaticMutex();
</span><span class="cx"> WTF_EXPORT_PRIVATE void unlockAtomicallyInitializedStaticMutex();
</span><span class="cx">
</span><span class="lines">@@ -112,6 +110,5 @@
</span><span class="cx"> using WTF::currentThread;
</span><span class="cx"> using WTF::detachThread;
</span><span class="cx"> using WTF::waitForThreadCompletion;
</span><del>-using WTF::yield;
</del><span class="cx">
</span><span class="cx"> #endif // Threading_h
</span></span></pre></div>
<a id="trunkSourceWTFwtfThreadingPrimitivesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/ThreadingPrimitives.h (160958 => 160959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/ThreadingPrimitives.h 2013-12-21 04:58:15 UTC (rev 160958)
+++ trunk/Source/WTF/wtf/ThreadingPrimitives.h 2013-12-21 05:23:10 UTC (rev 160959)
</span><span class="lines">@@ -130,22 +130,12 @@
</span><span class="cx"> WTF_EXPORT_PRIVATE DWORD absoluteTimeToWaitTimeoutInterval(double absoluteTime);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-inline void pauseBriefly()
-{
-#if OS(WINDOWS)
- Sleep(0);
-#else
- sched_yield();
-#endif
-}
-
</del><span class="cx"> } // namespace WTF
</span><span class="cx">
</span><span class="cx"> using WTF::Mutex;
</span><span class="cx"> using WTF::MutexLocker;
</span><span class="cx"> using WTF::MutexTryLocker;
</span><span class="cx"> using WTF::ThreadCondition;
</span><del>-using WTF::pauseBriefly;
</del><span class="cx">
</span><span class="cx"> #if OS(WINDOWS)
</span><span class="cx"> using WTF::absoluteTimeToWaitTimeoutInterval;
</span></span></pre></div>
<a id="trunkSourceWTFwtfThreadingPthreadscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/ThreadingPthreads.cpp (160958 => 160959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/ThreadingPthreads.cpp 2013-12-21 04:58:15 UTC (rev 160958)
+++ trunk/Source/WTF/wtf/ThreadingPthreads.cpp 2013-12-21 05:23:10 UTC (rev 160959)
</span><span class="lines">@@ -303,11 +303,6 @@
</span><span class="cx"> threadMap().remove(threadID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void yield()
-{
- sched_yield();
-}
-
</del><span class="cx"> ThreadIdentifier currentThread()
</span><span class="cx"> {
</span><span class="cx"> ThreadIdentifier id = ThreadIdentifierData::identifier();
</span></span></pre></div>
<a id="trunkSourceWTFwtfThreadingWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/ThreadingWin.cpp (160958 => 160959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/ThreadingWin.cpp 2013-12-21 04:58:15 UTC (rev 160958)
+++ trunk/Source/WTF/wtf/ThreadingWin.cpp 2013-12-21 05:23:10 UTC (rev 160959)
</span><span class="lines">@@ -284,11 +284,6 @@
</span><span class="cx"> clearThreadHandleForIdentifier(threadID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void yield()
-{
- ::Sleep(1);
-}
-
</del><span class="cx"> ThreadIdentifier currentThread()
</span><span class="cx"> {
</span><span class="cx"> return static_cast<ThreadIdentifier>(GetCurrentThreadId());
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160958 => 160959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-21 04:58:15 UTC (rev 160958)
+++ trunk/Source/WebCore/ChangeLog 2013-12-21 05:23:10 UTC (rev 160959)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2013-12-20 Anders Carlsson <andersca@apple.com>
+
+ Replace yield() and pauseBriefly() with std::this_thread::yield()
+ https://bugs.webkit.org/show_bug.cgi?id=126105
+
+ Reviewed by Sam Weinig.
+
+ * platform/sql/SQLiteDatabase.cpp:
+ (WebCore::SQLiteDatabase::interrupt):
+
</ins><span class="cx"> 2013-12-20 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Assert that RootInlineBox::setLineBreakInfo should is never called on a RenderInline without line boxes
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformsqlSQLiteDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/sql/SQLiteDatabase.cpp (160958 => 160959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/sql/SQLiteDatabase.cpp 2013-12-21 04:58:15 UTC (rev 160958)
+++ trunk/Source/WebCore/platform/sql/SQLiteDatabase.cpp 2013-12-21 05:23:10 UTC (rev 160959)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "SQLiteFileSystem.h"
</span><span class="cx"> #include "SQLiteStatement.h"
</span><span class="cx"> #include <sqlite3.h>
</span><ins>+#include <thread>
</ins><span class="cx"> #include <wtf/Threading.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -140,7 +141,7 @@
</span><span class="cx"> if (!m_db)
</span><span class="cx"> return;
</span><span class="cx"> sqlite3_interrupt(m_db);
</span><del>- yield();
</del><ins>+ std::this_thread::yield();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_lockingMutex.unlock();
</span></span></pre>
</div>
</div>
</body>
</html>