<!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>[167526] trunk/Source/bmalloc</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/167526">167526</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2014-04-18 20:23:03 -0700 (Fri, 18 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>bmalloc: AsyncTask should use Mutex instead of std::mutex
https://bugs.webkit.org/show_bug.cgi?id=131865
Reviewed by Gavin Barraclough.
std::mutex is so slow that it makes parallelizing simple tasks through
AsyncTask a net regression. Mutex fixes this.
* bmalloc/AsyncTask.h:
(bmalloc::Function>::AsyncTask):
(bmalloc::Function>::join):
(bmalloc::Function>::runSlowCase):
(bmalloc::Function>::entryPoint):
* bmalloc/Mutex.h:
(bmalloc::Mutex::init):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourcebmallocChangeLog">trunk/Source/bmalloc/ChangeLog</a></li>
<li><a href="#trunkSourcebmallocbmallocAsyncTaskh">trunk/Source/bmalloc/bmalloc/AsyncTask.h</a></li>
<li><a href="#trunkSourcebmallocbmallocMutexh">trunk/Source/bmalloc/bmalloc/Mutex.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourcebmallocChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/ChangeLog (167525 => 167526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/ChangeLog 2014-04-19 01:38:31 UTC (rev 167525)
+++ trunk/Source/bmalloc/ChangeLog 2014-04-19 03:23:03 UTC (rev 167526)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2014-04-18 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><ins>+ bmalloc: AsyncTask should use Mutex instead of std::mutex
+ https://bugs.webkit.org/show_bug.cgi?id=131865
+
+ Reviewed by Gavin Barraclough.
+
+ std::mutex is so slow that it makes parallelizing simple tasks through
+ AsyncTask a net regression. Mutex fixes this.
+
+ * bmalloc/AsyncTask.h:
+ (bmalloc::Function>::AsyncTask):
+ (bmalloc::Function>::join):
+ (bmalloc::Function>::runSlowCase):
+ (bmalloc::Function>::entryPoint):
+ * bmalloc/Mutex.h:
+ (bmalloc::Mutex::init):
+
+2014-04-18 Geoffrey Garen <ggaren@apple.com>
+
</ins><span class="cx"> bmalloc: Added an XSmall line size
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=131851
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocAsyncTaskh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/AsyncTask.h (167525 => 167526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/AsyncTask.h 2014-04-19 01:38:31 UTC (rev 167525)
+++ trunk/Source/bmalloc/bmalloc/AsyncTask.h 2014-04-19 03:23:03 UTC (rev 167526)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "BAssert.h"
</span><span class="cx"> #include "Inline.h"
</span><ins>+#include "Mutex.h"
</ins><span class="cx"> #include <atomic>
</span><span class="cx"> #include <condition_variable>
</span><span class="cx"> #include <pthread.h>
</span><span class="lines">@@ -55,8 +56,8 @@
</span><span class="cx">
</span><span class="cx"> std::atomic<State> m_state;
</span><span class="cx">
</span><del>- std::mutex m_conditionMutex;
- std::condition_variable m_condition;
</del><ins>+ Mutex m_conditionMutex;
+ std::condition_variable_any m_condition;
</ins><span class="cx"> pthread_t m_thread;
</span><span class="cx">
</span><span class="cx"> Object& m_object;
</span><span class="lines">@@ -73,6 +74,7 @@
</span><span class="cx"> , m_object(object)
</span><span class="cx"> , m_function(function)
</span><span class="cx"> {
</span><ins>+ m_conditionMutex.init();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename Object, typename Function>
</span><span class="lines">@@ -81,7 +83,7 @@
</span><span class="cx"> if (m_state == Exited)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- { std::lock_guard<std::mutex> lock(m_conditionMutex); }
</del><ins>+ { std::lock_guard<Mutex> lock(m_conditionMutex); }
</ins><span class="cx"> m_condition.notify_one();
</span><span class="cx">
</span><span class="cx"> while (m_state != Exited)
</span><span class="lines">@@ -104,7 +106,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (oldState == Sleeping) {
</span><del>- { std::lock_guard<std::mutex> lock(m_conditionMutex); }
</del><ins>+ { std::lock_guard<Mutex> lock(m_conditionMutex); }
</ins><span class="cx"> m_condition.notify_one();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -131,7 +133,7 @@
</span><span class="cx">
</span><span class="cx"> expectedState = Running;
</span><span class="cx"> if (m_state.compare_exchange_weak(expectedState, Sleeping)) {
</span><del>- std::unique_lock<std::mutex> lock(m_conditionMutex);
</del><ins>+ std::unique_lock<Mutex> lock(m_conditionMutex);
</ins><span class="cx"> m_condition.wait_for(lock, exitDelay, [=]() { return this->m_state != Sleeping; });
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocMutexh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Mutex.h (167525 => 167526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Mutex.h 2014-04-19 01:38:31 UTC (rev 167525)
+++ trunk/Source/bmalloc/bmalloc/Mutex.h 2014-04-19 03:23:03 UTC (rev 167526)
</span><span class="lines">@@ -33,8 +33,10 @@
</span><span class="cx">
</span><span class="cx"> namespace bmalloc {
</span><span class="cx">
</span><del>-class Mutex {
</del><ins>+struct Mutex {
</ins><span class="cx"> public:
</span><ins>+ void init();
+
</ins><span class="cx"> void lock();
</span><span class="cx"> bool try_lock();
</span><span class="cx"> void unlock();
</span><span class="lines">@@ -45,6 +47,11 @@
</span><span class="cx"> std::atomic_flag m_flag;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+inline void Mutex::init()
+{
+ m_flag.clear();
+}
+
</ins><span class="cx"> inline bool Mutex::try_lock()
</span><span class="cx"> {
</span><span class="cx"> return !m_flag.test_and_set(std::memory_order_acquire);
</span></span></pre>
</div>
</div>
</body>
</html>