<!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>[209251] 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/209251">209251</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-12-02 11:55:09 -0800 (Fri, 02 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>IndexedDB.IndexedDBMultiProcess and IndexedDB.WebProcessKillIDBCleanup sometimes timeout.
https://bugs.webkit.org/show_bug.cgi?id=160780 and https://bugs.webkit.org/show_bug.cgi?id=161001
Reviewed by Alexey Proskuryakov.
These tests had "run-loop races."
The test spins the runloop waiting for one message.
Two messages might come in from the WebProcess in short succession, and both be delivered to the
UIProcess in the same spin of the runloop.
Therefore by the time the test stops spinning the runloop, notified that a message was received,
the first message has been overwritten by the second.
These tests are fixed by queueing the incoming messages instead of just storing one.
* TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess.mm:
(-[IndexedDBMPMessageHandler userContentController:didReceiveScriptMessage:]):
(getNextMessage):
(TEST):
* TestWebKitAPI/Tests/WebKit2Cocoa/WebProcessKillIDBCleanup.mm:
(-[IndexedDBWebProcessKillMessageHandler userContentController:didReceiveScriptMessage:]):
(getNextMessage):
(TEST):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaIndexedDBMultiProcessmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaWebProcessKillIDBCleanupmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebProcessKillIDBCleanup.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (209250 => 209251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-12-02 19:34:31 UTC (rev 209250)
+++ trunk/Tools/ChangeLog 2016-12-02 19:55:09 UTC (rev 209251)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2016-12-02 Brady Eidson <beidson@apple.com>
+
+ IndexedDB.IndexedDBMultiProcess and IndexedDB.WebProcessKillIDBCleanup sometimes timeout.
+ https://bugs.webkit.org/show_bug.cgi?id=160780 and https://bugs.webkit.org/show_bug.cgi?id=161001
+
+ Reviewed by Alexey Proskuryakov.
+
+ These tests had "run-loop races."
+
+ The test spins the runloop waiting for one message.
+ Two messages might come in from the WebProcess in short succession, and both be delivered to the
+ UIProcess in the same spin of the runloop.
+
+ Therefore by the time the test stops spinning the runloop, notified that a message was received,
+ the first message has been overwritten by the second.
+
+ These tests are fixed by queueing the incoming messages instead of just storing one.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess.mm:
+ (-[IndexedDBMPMessageHandler userContentController:didReceiveScriptMessage:]):
+ (getNextMessage):
+ (TEST):
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/WebProcessKillIDBCleanup.mm:
+ (-[IndexedDBWebProcessKillMessageHandler userContentController:didReceiveScriptMessage:]):
+ (getNextMessage):
+ (TEST):
+
</ins><span class="cx"> 2016-12-01 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a runtime flag for SubtleCrypto
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaIndexedDBMultiProcessmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess.mm (209250 => 209251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess.mm 2016-12-02 19:34:31 UTC (rev 209250)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess.mm 2016-12-02 19:55:09 UTC (rev 209251)
</span><span class="lines">@@ -33,12 +33,13 @@
</span><span class="cx"> #import <WebKit/WKWebViewConfigurationPrivate.h>
</span><span class="cx"> #import <WebKit/_WKProcessPoolConfiguration.h>
</span><span class="cx"> #import <WebKit/_WKUserStyleSheet.h>
</span><ins>+#import <wtf/Deque.h>
</ins><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><span class="cx"> static bool receivedScriptMessage;
</span><del>-static RetainPtr<WKScriptMessage> lastScriptMessage;
</del><ins>+static Deque<RetainPtr<WKScriptMessage>> scriptMessages;
</ins><span class="cx">
</span><span class="cx"> @interface IndexedDBMPMessageHandler : NSObject <WKScriptMessageHandler>
</span><span class="cx"> @end
</span><span class="lines">@@ -48,11 +49,21 @@
</span><span class="cx"> - (void)userContentController:(WKUserContentController *)userContentController didReceiveScriptMessage:(WKScriptMessage *)message
</span><span class="cx"> {
</span><span class="cx"> receivedScriptMessage = true;
</span><del>- lastScriptMessage = message;
</del><ins>+ scriptMessages.append(message);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+static WKScriptMessage *getNextMessage()
+{
+ if (scriptMessages.isEmpty()) {
+ receivedScriptMessage = false;
+ TestWebKitAPI::Util::run(&receivedScriptMessage);
+ }
+
+ return [[scriptMessages.takeFirst() retain] autorelease];
+}
+
</ins><span class="cx"> TEST(IndexedDB, IndexedDBMultiProcess)
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<IndexedDBMPMessageHandler> handler = adoptNS([[IndexedDBMPMessageHandler alloc] init]);
</span><span class="lines">@@ -66,18 +77,10 @@
</span><span class="cx"> NSURLRequest *request = [NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"IndexedDBMultiProcess-1" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]];
</span><span class="cx"> [webView loadRequest:request];
</span><span class="cx">
</span><del>- TestWebKitAPI::Util::run(&receivedScriptMessage);
- receivedScriptMessage = false;
- RetainPtr<NSString> string1 = (NSString *)[lastScriptMessage body];
</del><ins>+ RetainPtr<NSString> string1 = (NSString *)[getNextMessage() body];
+ RetainPtr<NSString> string2 = (NSString *)[getNextMessage() body];
+ RetainPtr<NSString> string3 = (NSString *)[getNextMessage() body];
</ins><span class="cx">
</span><del>- TestWebKitAPI::Util::run(&receivedScriptMessage);
- receivedScriptMessage = false;
- RetainPtr<NSString> string2 = (NSString *)[lastScriptMessage body];
-
- TestWebKitAPI::Util::run(&receivedScriptMessage);
- receivedScriptMessage = false;
- RetainPtr<NSString> string3 = (NSString *)[lastScriptMessage body];
-
</del><span class="cx"> // Make a new web view with a new web process to continue the test
</span><span class="cx"> RetainPtr<WKWebView> webView2 = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
</span><span class="cx">
</span><span class="lines">@@ -84,9 +87,7 @@
</span><span class="cx"> request = [NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"IndexedDBMultiProcess-2" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]];
</span><span class="cx"> [webView2 loadRequest:request];
</span><span class="cx">
</span><del>- TestWebKitAPI::Util::run(&receivedScriptMessage);
- receivedScriptMessage = false;
- RetainPtr<NSString> string4 = (NSString *)[lastScriptMessage body];
</del><ins>+ RetainPtr<NSString> string4 = (NSString *)[getNextMessage() body];
</ins><span class="cx">
</span><span class="cx"> EXPECT_WK_STREQ(@"UpgradeNeeded", string1.get());
</span><span class="cx"> EXPECT_WK_STREQ(@"Transaction complete", string2.get());
</span><span class="lines">@@ -93,9 +94,7 @@
</span><span class="cx"> EXPECT_WK_STREQ(@"Open success", string3.get());
</span><span class="cx"> EXPECT_WK_STREQ(@"Value of foo: bar", string4.get());
</span><span class="cx">
</span><del>- TestWebKitAPI::Util::run(&receivedScriptMessage);
- receivedScriptMessage = false;
- RetainPtr<NSString> string5 = (NSString *)[lastScriptMessage body];
</del><ins>+ RetainPtr<NSString> string5 = (NSString *)[getNextMessage() body];
</ins><span class="cx"> EXPECT_WK_STREQ(@"Get loops started", string5.get());
</span><span class="cx">
</span><span class="cx"> // Make a new web view with a new web process to continue the test
</span><span class="lines">@@ -103,17 +102,13 @@
</span><span class="cx"> request = [NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"IndexedDBMultiProcess-3" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]];
</span><span class="cx"> [webView3 loadRequest:request];
</span><span class="cx">
</span><del>- TestWebKitAPI::Util::run(&receivedScriptMessage);
- receivedScriptMessage = false;
- RetainPtr<NSString> string6 = (NSString *)[lastScriptMessage body];
</del><ins>+ RetainPtr<NSString> string6 = (NSString *)[getNextMessage() body];
</ins><span class="cx"> EXPECT_WK_STREQ(@"Blocked!", string6.get());
</span><span class="cx">
</span><span class="cx"> // Kill the blocking web process
</span><span class="cx"> webView2 = nil;
</span><span class="cx">
</span><del>- TestWebKitAPI::Util::run(&receivedScriptMessage);
- receivedScriptMessage = false;
- RetainPtr<NSString> string7 = (NSString *)[lastScriptMessage body];
</del><ins>+ RetainPtr<NSString> string7 = (NSString *)[getNextMessage() body];
</ins><span class="cx"> EXPECT_WK_STREQ(@"Deleted!", string7.get());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaWebProcessKillIDBCleanupmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebProcessKillIDBCleanup.mm (209250 => 209251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebProcessKillIDBCleanup.mm 2016-12-02 19:34:31 UTC (rev 209250)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebProcessKillIDBCleanup.mm 2016-12-02 19:55:09 UTC (rev 209251)
</span><span class="lines">@@ -34,12 +34,13 @@
</span><span class="cx"> #import <WebKit/WKWebViewConfigurationPrivate.h>
</span><span class="cx"> #import <WebKit/_WKProcessPoolConfiguration.h>
</span><span class="cx"> #import <WebKit/_WKUserStyleSheet.h>
</span><ins>+#import <wtf/Deque.h>
</ins><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><span class="cx"> static bool receivedScriptMessage;
</span><del>-static RetainPtr<WKScriptMessage> lastScriptMessage;
</del><ins>+static Deque<RetainPtr<WKScriptMessage>> scriptMessages;
</ins><span class="cx">
</span><span class="cx"> @interface IndexedDBWebProcessKillMessageHandler : NSObject <WKScriptMessageHandler>
</span><span class="cx"> @end
</span><span class="lines">@@ -49,11 +50,21 @@
</span><span class="cx"> - (void)userContentController:(WKUserContentController *)userContentController didReceiveScriptMessage:(WKScriptMessage *)message
</span><span class="cx"> {
</span><span class="cx"> receivedScriptMessage = true;
</span><del>- lastScriptMessage = message;
</del><ins>+ scriptMessages.append(message);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+static WKScriptMessage *getNextMessage()
+{
+ if (scriptMessages.isEmpty()) {
+ receivedScriptMessage = false;
+ TestWebKitAPI::Util::run(&receivedScriptMessage);
+ }
+
+ return [[scriptMessages.takeFirst() retain] autorelease];
+}
+
</ins><span class="cx"> TEST(IndexedDB, WebProcessKillIDBCleanup)
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<IndexedDBWebProcessKillMessageHandler> handler = adoptNS([[IndexedDBWebProcessKillMessageHandler alloc] init]);
</span><span class="lines">@@ -67,22 +78,11 @@
</span><span class="cx"> NSURLRequest *request = [NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"WebProcessKillIDBCleanup-1" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]];
</span><span class="cx"> [webView loadRequest:request];
</span><span class="cx">
</span><del>- TestWebKitAPI::Util::run(&receivedScriptMessage);
- receivedScriptMessage = false;
- RetainPtr<NSString> string1 = (NSString *)[lastScriptMessage body];
</del><ins>+ RetainPtr<NSString> string1 = (NSString *)[getNextMessage() body];
+ RetainPtr<NSString> string2 = (NSString *)[getNextMessage() body];
+ RetainPtr<NSString> string3 = (NSString *)[getNextMessage() body];
+ RetainPtr<NSString> string4 = (NSString *)[getNextMessage() body];
</ins><span class="cx">
</span><del>- TestWebKitAPI::Util::run(&receivedScriptMessage);
- receivedScriptMessage = false;
- RetainPtr<NSString> string2 = (NSString *)[lastScriptMessage body];
-
- TestWebKitAPI::Util::run(&receivedScriptMessage);
- receivedScriptMessage = false;
- RetainPtr<NSString> string3 = (NSString *)[lastScriptMessage body];
-
- TestWebKitAPI::Util::run(&receivedScriptMessage);
- receivedScriptMessage = false;
- RetainPtr<NSString> string4 = (NSString *)[lastScriptMessage body];
-
</del><span class="cx"> // Kill that web process
</span><span class="cx"> webView = nil;
</span><span class="cx">
</span><span class="lines">@@ -92,14 +92,9 @@
</span><span class="cx"> request = [NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"WebProcessKillIDBCleanup-2" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]];
</span><span class="cx"> [webView2 loadRequest:request];
</span><span class="cx">
</span><del>- TestWebKitAPI::Util::run(&receivedScriptMessage);
- receivedScriptMessage = false;
- RetainPtr<NSString> string5 = (NSString *)[lastScriptMessage body];
</del><ins>+ RetainPtr<NSString> string5 = (NSString *)[getNextMessage() body];
+ RetainPtr<NSString> string6 = (NSString *)[getNextMessage() body];
</ins><span class="cx">
</span><del>- TestWebKitAPI::Util::run(&receivedScriptMessage);
- receivedScriptMessage = false;
- RetainPtr<NSString> string6 = (NSString *)[lastScriptMessage body];
-
</del><span class="cx"> EXPECT_WK_STREQ(@"UpgradeNeeded", string1.get());
</span><span class="cx"> EXPECT_WK_STREQ(@"Transaction complete", string2.get());
</span><span class="cx"> EXPECT_WK_STREQ(@"Open success", string3.get());
</span></span></pre>
</div>
</div>
</body>
</html>