<!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>[285222] trunk</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/285222">285222</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2021-11-03 13:12:23 -0700 (Wed, 03 Nov 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>_pasteboardWithName should be thread-safe
https://bugs.webkit.org/show_bug.cgi?id=232670

Reviewed by Tim Horton.

Source/WTF:

wtf/Atomics.h uses WTF_MAKE_STRUCT_FAST_ALLOCATED which is declared in
wtf/FastMalloc.h but was failing to include it. This was leading to a
build error when I tried including wtf/Lock.h in WKTR.

* wtf/Atomics.h:

Tools:

_pasteboardWithName should be thread-safe, to match [NSPasteboard _pasteboardWithName].
This was leading to flaky crashes in _pasteboardWithName getting called off the main
thread from ShareKit code.

* DumpRenderTree/mac/DumpRenderTreePasteboard.mm:
(+[DumpRenderTreePasteboard _pasteboardWithName:]):
(+[DumpRenderTreePasteboard releaseLocalPasteboards]):
* WebKitTestRunner/mac/WebKitTestRunnerPasteboard.mm:
(+[WebKitTestRunnerPasteboard _pasteboardWithName:]):
(+[WebKitTestRunnerPasteboard releaseLocalPasteboards]):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfAtomicsh">trunk/Source/WTF/wtf/Atomics.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreemacDumpRenderTreePasteboardmm">trunk/Tools/DumpRenderTree/mac/DumpRenderTreePasteboard.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnermacWebKitTestRunnerPasteboardmm">trunk/Tools/WebKitTestRunner/mac/WebKitTestRunnerPasteboard.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (285221 => 285222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog       2021-11-03 20:11:28 UTC (rev 285221)
+++ trunk/Source/WTF/ChangeLog  2021-11-03 20:12:23 UTC (rev 285222)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2021-11-03  Chris Dumez  <cdumez@apple.com>
+
+        _pasteboardWithName should be thread-safe
+        https://bugs.webkit.org/show_bug.cgi?id=232670
+
+        Reviewed by Tim Horton.
+
+        wtf/Atomics.h uses WTF_MAKE_STRUCT_FAST_ALLOCATED which is declared in
+        wtf/FastMalloc.h but was failing to include it. This was leading to a
+        build error when I tried including wtf/Lock.h in WKTR.
+
+        * wtf/Atomics.h:
+
</ins><span class="cx"> 2021-11-02  Brady Eidson  <beidson@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Notifications on iOS enabled at compile-time, disabled at runtime
</span></span></pre></div>
<a id="trunkSourceWTFwtfAtomicsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Atomics.h (285221 => 285222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Atomics.h   2021-11-03 20:11:28 UTC (rev 285221)
+++ trunk/Source/WTF/wtf/Atomics.h      2021-11-03 20:12:23 UTC (rev 285222)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #pragma once
</span><span class="cx"> 
</span><span class="cx"> #include <atomic>
</span><ins>+#include <wtf/FastMalloc.h>
</ins><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx"> 
</span><span class="cx"> #if OS(WINDOWS)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (285221 => 285222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-11-03 20:11:28 UTC (rev 285221)
+++ trunk/Tools/ChangeLog       2021-11-03 20:12:23 UTC (rev 285222)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2021-11-03  Chris Dumez  <cdumez@apple.com>
+
+        _pasteboardWithName should be thread-safe
+        https://bugs.webkit.org/show_bug.cgi?id=232670
+
+        Reviewed by Tim Horton.
+
+        _pasteboardWithName should be thread-safe, to match [NSPasteboard _pasteboardWithName].
+        This was leading to flaky crashes in _pasteboardWithName getting called off the main
+        thread from ShareKit code.
+
+        * DumpRenderTree/mac/DumpRenderTreePasteboard.mm:
+        (+[DumpRenderTreePasteboard _pasteboardWithName:]):
+        (+[DumpRenderTreePasteboard releaseLocalPasteboards]):
+        * WebKitTestRunner/mac/WebKitTestRunnerPasteboard.mm:
+        (+[WebKitTestRunnerPasteboard _pasteboardWithName:]):
+        (+[WebKitTestRunnerPasteboard releaseLocalPasteboards]):
+
</ins><span class="cx"> 2021-11-03  Ryan Haddad  <ryanhaddad@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [EWS] Add more bots to iOS layout and API test queues
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreePasteboardmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTreePasteboard.mm (285221 => 285222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTreePasteboard.mm       2021-11-03 20:11:28 UTC (rev 285221)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTreePasteboard.mm  2021-11-03 20:12:23 UTC (rev 285222)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx"> #import <wtf/HashMap.h>
</span><span class="cx"> #import <wtf/ListHashSet.h>
</span><ins>+#import <wtf/Lock.h>
</ins><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx"> 
</span><span class="cx"> @interface LocalPasteboard : NSPasteboard {
</span><span class="lines">@@ -55,7 +56,8 @@
</span><span class="cx"> -(id)initWithName:(NSString *)name;
</span><span class="cx"> @end
</span><span class="cx"> 
</span><del>-static RetainPtr<NSMutableDictionary> localPasteboards;
</del><ins>+static Lock localPasteboardsLock;
+static RetainPtr<NSMutableDictionary> localPasteboards WTF_GUARDED_BY_LOCK(localPasteboardsLock);
</ins><span class="cx"> 
</span><span class="cx"> @implementation DumpRenderTreePasteboard
</span><span class="cx"> 
</span><span class="lines">@@ -62,9 +64,10 @@
</span><span class="cx"> // Return a local pasteboard so we don't disturb the real pasteboards when running tests.
</span><span class="cx"> + (NSPasteboard *)_pasteboardWithName:(NSString *)name
</span><span class="cx"> {
</span><del>-    static int number = 0;
</del><ins>+    Locker locker { localPasteboardsLock };
+    static uint64_t number WTF_GUARDED_BY_LOCK(localPasteboardsLock) = 0;
</ins><span class="cx">     if (!name)
</span><del>-        name = [NSString stringWithFormat:@"LocalPasteboard%d", ++number];
</del><ins>+        name = [NSString stringWithFormat:@"LocalPasteboard%llu", ++number];
</ins><span class="cx">     if (!localPasteboards)
</span><span class="cx">         localPasteboards = adoptNS([[NSMutableDictionary alloc] init]);
</span><span class="cx">     if (LocalPasteboard *pasteboard = [localPasteboards objectForKey:name])
</span><span class="lines">@@ -76,6 +79,7 @@
</span><span class="cx"> 
</span><span class="cx"> + (void)releaseLocalPasteboards
</span><span class="cx"> {
</span><ins>+    Locker locker { localPasteboardsLock };
</ins><span class="cx">     localPasteboards = nil;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnermacWebKitTestRunnerPasteboardmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/mac/WebKitTestRunnerPasteboard.mm (285221 => 285222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/mac/WebKitTestRunnerPasteboard.mm   2021-11-03 20:11:28 UTC (rev 285221)
+++ trunk/Tools/WebKitTestRunner/mac/WebKitTestRunnerPasteboard.mm      2021-11-03 20:12:23 UTC (rev 285222)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> 
</span><span class="cx"> #import "NSPasteboardAdditions.h"
</span><span class="cx"> #import <objc/runtime.h>
</span><ins>+#import <wtf/Lock.h>
</ins><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx"> 
</span><span class="cx"> @interface LocalPasteboard : NSPasteboard
</span><span class="lines">@@ -45,7 +46,8 @@
</span><span class="cx"> -(id)initWithName:(NSString *)name;
</span><span class="cx"> @end
</span><span class="cx"> 
</span><del>-static RetainPtr<NSMutableDictionary> localPasteboards;
</del><ins>+static Lock localPasteboardsLock;
+static RetainPtr<NSMutableDictionary> localPasteboards WTF_GUARDED_BY_LOCK(localPasteboardsLock);
</ins><span class="cx"> 
</span><span class="cx"> @implementation WebKitTestRunnerPasteboard
</span><span class="cx"> 
</span><span class="lines">@@ -52,9 +54,10 @@
</span><span class="cx"> // Return a local pasteboard so we don't disturb the real pasteboards when running tests.
</span><span class="cx"> + (NSPasteboard *)_pasteboardWithName:(NSString *)name
</span><span class="cx"> {
</span><del>-    static int number = 0;
</del><ins>+    Locker locker { localPasteboardsLock };
+    static uint64_t number WTF_GUARDED_BY_LOCK(localPasteboardsLock) = 0;
</ins><span class="cx">     if (!name)
</span><del>-        name = [NSString stringWithFormat:@"LocalPasteboard%d", ++number];
</del><ins>+        name = [NSString stringWithFormat:@"LocalPasteboard%llu", ++number];
</ins><span class="cx">     if (!localPasteboards)
</span><span class="cx">         localPasteboards = adoptNS([[NSMutableDictionary alloc] init]);
</span><span class="cx">     if (LocalPasteboard *pasteboard = [localPasteboards objectForKey:name])
</span><span class="lines">@@ -72,6 +75,7 @@
</span><span class="cx"> 
</span><span class="cx"> + (void)releaseLocalPasteboards
</span><span class="cx"> {
</span><ins>+    Locker locker { localPasteboardsLock };
</ins><span class="cx">     localPasteboards = nil;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>