<!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>[200993] 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/200993">200993</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2016-05-16 21:02:40 -0700 (Mon, 16 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>ARMV7K: Crash at JavaScriptCore: WTF::ScopedLambdaFunctor<bool
https://bugs.webkit.org/show_bug.cgi?id=157781
Reviewed by Filip Pizlo.
Replaced use of ScopedLambda in locking code with std::function much as it was
before change set 199760 to work around what appears to be a clang compiler issue.
* wtf/ParkingLot.cpp:
(WTF::ParkingLot::parkConditionallyImpl):
(WTF::ParkingLot::unparkOne):
(WTF::ParkingLot::unparkAll):
(WTF::ParkingLot::forEach):
(WTF::ParkingLot::unparkOneImpl): Deleted.
(WTF::ParkingLot::forEachImpl): Deleted.
* wtf/ParkingLot.h:
(WTF::ParkingLot::parkConditionally):
(WTF::ParkingLot::unparkOne): Deleted.
(WTF::ParkingLot::forEach): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfParkingLotcpp">trunk/Source/WTF/wtf/ParkingLot.cpp</a></li>
<li><a href="#trunkSourceWTFwtfParkingLoth">trunk/Source/WTF/wtf/ParkingLot.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (200992 => 200993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-05-17 03:36:45 UTC (rev 200992)
+++ trunk/Source/WTF/ChangeLog 2016-05-17 04:02:40 UTC (rev 200993)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-05-16 Michael Saboff <msaboff@apple.com>
+
+ ARMV7K: Crash at JavaScriptCore: WTF::ScopedLambdaFunctor<bool
+ https://bugs.webkit.org/show_bug.cgi?id=157781
+
+ Reviewed by Filip Pizlo.
+
+ Replaced use of ScopedLambda in locking code with std::function much as it was
+ before change set 199760 to work around what appears to be a clang compiler issue.
+
+ * wtf/ParkingLot.cpp:
+ (WTF::ParkingLot::parkConditionallyImpl):
+ (WTF::ParkingLot::unparkOne):
+ (WTF::ParkingLot::unparkAll):
+ (WTF::ParkingLot::forEach):
+ (WTF::ParkingLot::unparkOneImpl): Deleted.
+ (WTF::ParkingLot::forEachImpl): Deleted.
+ * wtf/ParkingLot.h:
+ (WTF::ParkingLot::parkConditionally):
+ (WTF::ParkingLot::unparkOne): Deleted.
+ (WTF::ParkingLot::forEach): Deleted.
+
</ins><span class="cx"> 2016-05-15 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Use more references in JS wrappers related code
</span></span></pre></div>
<a id="trunkSourceWTFwtfParkingLotcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/ParkingLot.cpp (200992 => 200993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/ParkingLot.cpp 2016-05-17 03:36:45 UTC (rev 200992)
+++ trunk/Source/WTF/wtf/ParkingLot.cpp 2016-05-17 04:02:40 UTC (rev 200993)
</span><span class="lines">@@ -532,8 +532,8 @@
</span><span class="cx">
</span><span class="cx"> NEVER_INLINE bool ParkingLot::parkConditionallyImpl(
</span><span class="cx"> const void* address,
</span><del>- const ScopedLambda<bool()>& validation,
- const ScopedLambda<void()>& beforeSleep,
</del><ins>+ std::function<bool()> validation,
+ std::function<void()> beforeSleep,
</ins><span class="cx"> Clock::time_point timeout)
</span><span class="cx"> {
</span><span class="cx"> if (verbose)
</span><span class="lines">@@ -649,9 +649,9 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-NEVER_INLINE void ParkingLot::unparkOneImpl(
</del><ins>+NEVER_INLINE void ParkingLot::unparkOne(
</ins><span class="cx"> const void* address,
</span><del>- const ScopedLambda<void(ParkingLot::UnparkResult)>& callback)
</del><ins>+ std::function<void(ParkingLot::UnparkResult)> callback)
</ins><span class="cx"> {
</span><span class="cx"> if (verbose)
</span><span class="cx"> dataLog(toString(currentThread(), ": unparking one the hard way.\n"));
</span><span class="lines">@@ -719,7 +719,7 @@
</span><span class="cx"> dataLog(toString(currentThread(), ": done unparking.\n"));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-NEVER_INLINE void ParkingLot::forEachImpl(const ScopedLambda<void(ThreadIdentifier, const void*)>& callback)
</del><ins>+NEVER_INLINE void ParkingLot::forEach(std::function<void(ThreadIdentifier, const void*)> callback)
</ins><span class="cx"> {
</span><span class="cx"> Vector<Bucket*> bucketsToUnlock = lockHashtable();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfParkingLoth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/ParkingLot.h (200992 => 200993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/ParkingLot.h 2016-05-17 03:36:45 UTC (rev 200992)
+++ trunk/Source/WTF/wtf/ParkingLot.h 2016-05-17 04:02:40 UTC (rev 200993)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #include <chrono>
</span><span class="cx"> #include <functional>
</span><span class="cx"> #include <wtf/Atomics.h>
</span><del>-#include <wtf/ScopedLambda.h>
</del><span class="cx"> #include <wtf/Threading.h>
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="lines">@@ -61,8 +60,8 @@
</span><span class="cx"> {
</span><span class="cx"> return parkConditionallyImpl(
</span><span class="cx"> address,
</span><del>- scopedLambda<bool()>(std::forward<ValidationFunctor>(validation)),
- scopedLambda<void()>(std::forward<BeforeSleepFunctor>(beforeSleep)),
</del><ins>+ std::function<bool()>(std::forward<ValidationFunctor>(validation)),
+ std::function<void()>(std::forward<BeforeSleepFunctor>(beforeSleep)),
</ins><span class="cx"> timeout);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -101,11 +100,9 @@
</span><span class="cx"> // that race - see Rusty Russel's well-known usersem library - but it's not pretty. This form
</span><span class="cx"> // allows that race to be completely avoided, since there is no way that a thread can be parked
</span><span class="cx"> // while the callback is running.
</span><del>- template<typename CallbackFunctor>
- static void unparkOne(const void* address, CallbackFunctor&& callback)
- {
- unparkOneImpl(address, scopedLambda<void(UnparkResult)>(std::forward<CallbackFunctor>(callback)));
- }
</del><ins>+ WTF_EXPORT_PRIVATE static void unparkOne(
+ const void* address,
+ std::function<void(ParkingLot::UnparkResult)> callback);
</ins><span class="cx">
</span><span class="cx"> // Unparks every thread from the queue associated with the given address, which cannot be null.
</span><span class="cx"> WTF_EXPORT_PRIVATE static void unparkAll(const void* address);
</span><span class="lines">@@ -123,23 +120,19 @@
</span><span class="cx"> // As well as many other possible interleavings that all have T1 before T2 and T3 before T4 but are
</span><span class="cx"> // otherwise unconstrained. This method is useful primarily for debugging. It's also used by unit
</span><span class="cx"> // tests.
</span><del>- template<typename CallbackFunctor>
- static void forEach(CallbackFunctor&& callback)
- {
- forEachImpl(scopedLambda<void(ThreadIdentifier, const void*)>(std::forward<CallbackFunctor>(callback)));
- }
</del><ins>+ WTF_EXPORT_PRIVATE static void forEach(std::function<void(ThreadIdentifier, const void*)>);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> WTF_EXPORT_PRIVATE static bool parkConditionallyImpl(
</span><span class="cx"> const void* address,
</span><del>- const ScopedLambda<bool()>& validation,
- const ScopedLambda<void()>& beforeSleep,
</del><ins>+ std::function<bool()> validation,
+ std::function<void()> beforeSleep,
</ins><span class="cx"> Clock::time_point timeout);
</span><span class="cx">
</span><span class="cx"> WTF_EXPORT_PRIVATE static void unparkOneImpl(
</span><del>- const void* address, const ScopedLambda<void(UnparkResult)>& callback);
</del><ins>+ const void* address, std::function<void(UnparkResult)> callback);
</ins><span class="cx">
</span><del>- WTF_EXPORT_PRIVATE static void forEachImpl(const ScopedLambda<void(ThreadIdentifier, const void*)>&);
</del><ins>+ WTF_EXPORT_PRIVATE static void forEachImpl(const std::function<void(ThreadIdentifier, const void*)>&);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WTF
</span></span></pre>
</div>
</div>
</body>
</html>