<!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>[201928] trunk/Tools</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/201928">201928</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-06-10 10:04:11 -0700 (Fri, 10 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>WTF_CrossThreadTask.Basic fails in all non mac ports.
https://bugs.webkit.org/show_bug.cgi?id=158612
Reviewed by Alex Christensen.
The test is very sensitive to argument evaluation order which is explicitly undefined in C++.
Instead, we should just count the appropriate events to forget their order.
* TestWebKitAPI/Tests/WTF/CrossThreadTask.cpp:
(TestWebKitAPI::LifetimeLogger::LifetimeLogger):
(TestWebKitAPI::LifetimeLogger::~LifetimeLogger):
(TestWebKitAPI::LifetimeLogger::isolatedCopy):
(TestWebKitAPI::LifetimeLogger::fullName):
(TestWebKitAPI::testFunction):
(TestWebKitAPI::TEST):
(TestWebKitAPI::LifetimeLogger::log): Deleted.
(TestWebKitAPI::LifetimeLogger::takeLogStr): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFCrossThreadTaskcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/CrossThreadTask.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (201927 => 201928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-06-10 16:45:49 UTC (rev 201927)
+++ trunk/Tools/ChangeLog 2016-06-10 17:04:11 UTC (rev 201928)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-06-10 Brady Eidson <beidson@apple.com>
+
+ WTF_CrossThreadTask.Basic fails in all non mac ports.
+ https://bugs.webkit.org/show_bug.cgi?id=158612
+
+ Reviewed by Alex Christensen.
+
+ The test is very sensitive to argument evaluation order which is explicitly undefined in C++.
+
+ Instead, we should just count the appropriate events to forget their order.
+
+ * TestWebKitAPI/Tests/WTF/CrossThreadTask.cpp:
+ (TestWebKitAPI::LifetimeLogger::LifetimeLogger):
+ (TestWebKitAPI::LifetimeLogger::~LifetimeLogger):
+ (TestWebKitAPI::LifetimeLogger::isolatedCopy):
+ (TestWebKitAPI::LifetimeLogger::fullName):
+ (TestWebKitAPI::testFunction):
+ (TestWebKitAPI::TEST):
+ (TestWebKitAPI::LifetimeLogger::log): Deleted.
+ (TestWebKitAPI::LifetimeLogger::takeLogStr): Deleted.
+
</ins><span class="cx"> 2016-06-09 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Clean up Tools *.vcxproj after switching to CMake.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFCrossThreadTaskcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/CrossThreadTask.cpp (201927 => 201928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/CrossThreadTask.cpp 2016-06-10 16:45:49 UTC (rev 201927)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/CrossThreadTask.cpp 2016-06-10 17:04:11 UTC (rev 201928)
</span><span class="lines">@@ -27,19 +27,29 @@
</span><span class="cx">
</span><span class="cx"> #include <string>
</span><span class="cx"> #include <wtf/CrossThreadTask.h>
</span><ins>+#include <wtf/HashCountedSet.h>
+#include <wtf/text/StringHash.h>
</ins><span class="cx">
</span><span class="cx"> namespace TestWebKitAPI {
</span><span class="cx">
</span><ins>+static size_t totalDestructorCalls;
+static size_t totalIsolatedCopyCalls;
+
+static HashCountedSet<String> defaultConstructorSet;
+static HashCountedSet<String> nameConstructorSet;
+static HashCountedSet<String> copyConstructorSet;
+static HashCountedSet<String> moveConstructorSet;
+
</ins><span class="cx"> struct LifetimeLogger {
</span><span class="cx"> LifetimeLogger()
</span><span class="cx"> {
</span><del>- log() << "default_constructor(" << &name << "-" << copyGeneration << "-" << moveGeneration << ") ";
</del><ins>+ defaultConstructorSet.add(fullName());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LifetimeLogger(const char* inputName)
</span><span class="cx"> : name(*inputName)
</span><span class="cx"> {
</span><del>- log() << "name_constructor(" << &name << "-" << copyGeneration << "-" << moveGeneration << ") ";
</del><ins>+ nameConstructorSet.add(fullName());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LifetimeLogger(const LifetimeLogger& other)
</span><span class="lines">@@ -47,7 +57,7 @@
</span><span class="cx"> , copyGeneration(other.copyGeneration + 1)
</span><span class="cx"> , moveGeneration(other.moveGeneration)
</span><span class="cx"> {
</span><del>- log() << "copy_constructor(" << &name << "-" << copyGeneration << "-" << moveGeneration << ") ";
</del><ins>+ copyConstructorSet.add(fullName());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LifetimeLogger(LifetimeLogger&& other)
</span><span class="lines">@@ -55,41 +65,33 @@
</span><span class="cx"> , copyGeneration(other.copyGeneration)
</span><span class="cx"> , moveGeneration(other.moveGeneration + 1)
</span><span class="cx"> {
</span><del>- log() << "move_constructor(" << &name << "-" << copyGeneration << "-" << moveGeneration << ") ";
</del><ins>+ moveConstructorSet.add(fullName());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ~LifetimeLogger()
</span><span class="cx"> {
</span><del>- log() << "destructor(" << &name << "-" << copyGeneration << "-" << moveGeneration << ") ";
</del><ins>+ ++totalDestructorCalls;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LifetimeLogger isolatedCopy() const
</span><span class="cx"> {
</span><del>- log() << "isolatedCopy() ";
</del><ins>+ ++totalIsolatedCopyCalls;
</ins><span class="cx"> return LifetimeLogger(*this);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ String fullName()
+ {
+ return makeString(&name, "-", String::number(copyGeneration), "-", String::number(moveGeneration));
+ }
+
</ins><span class="cx"> const char& name { *"<default>" };
</span><span class="cx"> int copyGeneration { 0 };
</span><span class="cx"> int moveGeneration { 0 };
</span><del>-
- static std::ostringstream& log()
- {
- static std::ostringstream log;
- return log;
- }
-
- static std::string takeLogStr()
- {
- std::string string = log().str();
- log().str("");
- return string;
- }
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> void testFunction(const LifetimeLogger&, const LifetimeLogger&, const LifetimeLogger&)
</span><span class="cx"> {
</span><del>- LifetimeLogger::log() << "testFunction called" << " ";
</del><ins>+ // Do nothing - Just need to check the side effects of the arguments getting in here.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WTF_CrossThreadTask, Basic)
</span><span class="lines">@@ -102,7 +104,29 @@
</span><span class="cx"> auto task = createCrossThreadTask(testFunction, logger1, logger2, logger3);
</span><span class="cx"> task.performTask();
</span><span class="cx"> }
</span><del>- ASSERT_STREQ("default_constructor(<default>-0-0) copy_constructor(<default>-1-0) name_constructor(logger-0-0) isolatedCopy() copy_constructor(<default>-1-0) isolatedCopy() copy_constructor(<default>-2-0) isolatedCopy() copy_constructor(logger-1-0) move_constructor(<default>-1-1) move_constructor(<default>-2-1) move_constructor(logger-1-1) destructor(logger-1-0) destructor(<default>-2-0) destructor(<default>-1-0) move_constructor(<default>-1-2) move_constructor(<default>-2-2) move_constructor(logger-1-2) destructor(logger-1-1) destructor(<default>-2-1) destructor(<default>-1-1) testFunction called destructor(logger-1-2) destructor(<default>-2-2) destructor(<default>-1-2) destructor(logger-0-0) destructor(<default>-1-0) destructor(<default>-0-0) ", LifetimeLogger::takeLogStr().c_str());
</del><ins>+
+ ASSERT_EQ(1u, defaultConstructorSet.size());
+ ASSERT_EQ(1u, defaultConstructorSet.count("<default>-0-0"));
+
+ ASSERT_EQ(1u, nameConstructorSet.size());
+ ASSERT_EQ(1u, nameConstructorSet.count("logger-0-0"));
+
+ ASSERT_EQ(3u, copyConstructorSet.size());
+ ASSERT_EQ(1u, copyConstructorSet.count("logger-1-0"));
+ ASSERT_EQ(2u, copyConstructorSet.count("<default>-1-0"));
+ ASSERT_EQ(1u, copyConstructorSet.count("<default>-2-0"));
+
+ ASSERT_EQ(6u, moveConstructorSet.size());
+ ASSERT_EQ(1u, moveConstructorSet.count("logger-1-1"));
+ ASSERT_EQ(1u, moveConstructorSet.count("logger-1-2"));
+ ASSERT_EQ(1u, moveConstructorSet.count("<default>-2-1"));
+ ASSERT_EQ(1u, moveConstructorSet.count("<default>-2-2"));
+ ASSERT_EQ(1u, moveConstructorSet.count("<default>-1-1"));
+ ASSERT_EQ(1u, moveConstructorSet.count("<default>-1-2"));
+
+ ASSERT_EQ(12u, totalDestructorCalls);
+ ASSERT_EQ(3u, totalIsolatedCopyCalls);
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace TestWebKitAPI
</span></span></pre>
</div>
</div>
</body>
</html>