<!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>[181308] trunk/Source/JavaScriptCore</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/181308">181308</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2015-03-09 21:21:42 -0700 (Mon, 09 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Build fix for Windows after <a href="http://trac.webkit.org/projects/webkit/changeset/181305">r181305</a>.
https://webkit.org/b/142513>
Reviewed by Alex Christensen.
Windows doesn't like pthreads anymore. Changed test to use WTF threading.
* API/tests/CompareAndSwapTest.cpp:
(setBitThreadFunc):
(testCompareAndSwap):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreAPItestsCompareAndSwapTestcpp">trunk/Source/JavaScriptCore/API/tests/CompareAndSwapTest.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreAPItestsCompareAndSwapTestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/tests/CompareAndSwapTest.cpp (181307 => 181308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/tests/CompareAndSwapTest.cpp 2015-03-10 04:10:15 UTC (rev 181307)
+++ trunk/Source/JavaScriptCore/API/tests/CompareAndSwapTest.cpp 2015-03-10 04:21:42 UTC (rev 181308)
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><span class="cx"> #include <stdio.h>
</span><del>-#include <thread>
</del><span class="cx"> #include <wtf/Atomics.h>
</span><ins>+#include <wtf/Threading.h>
</ins><span class="cx">
</span><span class="cx"> // Regression test for webkit.org/b/142513
</span><span class="cx"> extern "C" void testCompareAndSwap();
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> int numThreads;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-static void* setBitThreadFunc(void* p)
</del><ins>+static void setBitThreadFunc(void* p)
</ins><span class="cx"> {
</span><span class="cx"> Data* data = reinterpret_cast<Data*>(p);
</span><span class="cx"> Bitmap* bitmap = data->bitmap;
</span><span class="lines">@@ -92,14 +92,13 @@
</span><span class="cx"> while (!bitmap->concurrentTestAndSet(i)) { }
</span><span class="cx">
</span><span class="cx"> printf(" finished Thread %d\n", data->id);
</span><del>- pthread_exit(nullptr);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void testCompareAndSwap()
</span><span class="cx"> {
</span><span class="cx"> Bitmap bitmap;
</span><span class="cx"> const int numThreads = 5;
</span><del>- pthread_t threadIDs[numThreads];
</del><ins>+ ThreadIdentifier threadIDs[numThreads];
</ins><span class="cx"> Data data[numThreads];
</span><span class="cx">
</span><span class="cx"> printf("Starting %d threads for CompareAndSwap test. Test should complete without hanging.\n", numThreads);
</span><span class="lines">@@ -107,12 +106,13 @@
</span><span class="cx"> data[i].bitmap = &bitmap;
</span><span class="cx"> data[i].id = i;
</span><span class="cx"> data[i].numThreads = numThreads;
</span><del>- pthread_create(&threadIDs[i], 0, &setBitThreadFunc, &data[i]);
</del><ins>+ std::function<void()> threadFunc = std::bind(setBitThreadFunc, &data[i]);
+ threadIDs[i] = createThread("setBitThreadFunc", threadFunc);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> printf("Waiting for %d threads to join\n", numThreads);
</span><span class="cx"> for (int i = 0; i < numThreads; i++)
</span><del>- pthread_join(threadIDs[i], nullptr);
</del><ins>+ waitForThreadCompletion(threadIDs[i]);
</ins><span class="cx">
</span><span class="cx"> printf("PASS: CompareAndSwap test completed without a hang\n");
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (181307 => 181308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-03-10 04:10:15 UTC (rev 181307)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-03-10 04:21:42 UTC (rev 181308)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2015-03-09 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><ins>+ Build fix for Windows after r181305.
+ https://webkit.org/b/142513>
+
+ Reviewed by Alex Christensen.
+
+ Windows doesn't like pthreads anymore. Changed test to use WTF threading.
+
+ * API/tests/CompareAndSwapTest.cpp:
+ (setBitThreadFunc):
+ (testCompareAndSwap):
+
+2015-03-09 Mark Lam <mark.lam@apple.com>
+
</ins><span class="cx"> 8-bit version of weakCompareAndSwap() can cause an infinite loop.
</span><span class="cx"> https://webkit.org/b/142513>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>