<!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>[278242] 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/278242">278242</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2021-05-29 14:09:15 -0700 (Sat, 29 May 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Stop using UncheckedLock in JSC::dumpJITMemory()
https://bugs.webkit.org/show_bug.cgi?id=226413

Reviewed by Darin Adler.

Stop using UncheckedLock in JSC::dumpJITMemory() as it is being phased out in favor of Lock,
which supports Clang thread safety analysis.

* jit/ExecutableAllocator.cpp:
(JSC::dumpJITMemory):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorejitExecutableAllocatorcpp">trunk/Source/JavaScriptCore/jit/ExecutableAllocator.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (278241 => 278242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2021-05-29 21:08:38 UTC (rev 278241)
+++ trunk/Source/JavaScriptCore/ChangeLog       2021-05-29 21:09:15 UTC (rev 278242)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2021-05-29  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><ins>+        Stop using UncheckedLock in JSC::dumpJITMemory()
+        https://bugs.webkit.org/show_bug.cgi?id=226413
+
+        Reviewed by Darin Adler.
+
+        Stop using UncheckedLock in JSC::dumpJITMemory() as it is being phased out in favor of Lock,
+        which supports Clang thread safety analysis.
+
+        * jit/ExecutableAllocator.cpp:
+        (JSC::dumpJITMemory):
+
+2021-05-29  Chris Dumez  <cdumez@apple.com>
+
</ins><span class="cx">         Stop using UncheckedLock in JSC::WasmCalleeRegistry
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=226412
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitExecutableAllocatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/ExecutableAllocator.cpp (278241 => 278242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/ExecutableAllocator.cpp  2021-05-29 21:08:38 UTC (rev 278241)
+++ trunk/Source/JavaScriptCore/jit/ExecutableAllocator.cpp     2021-05-29 21:09:15 UTC (rev 278242)
</span><span class="lines">@@ -1034,67 +1034,72 @@
</span><span class="cx">     RELEASE_ASSERT(Options::dumpJITMemoryPath());
</span><span class="cx"> 
</span><span class="cx"> #if OS(DARWIN)
</span><del>-    static int fd = -1;
</del><ins>+    static Lock dumpJITMemoryLock;
+    static int fd WTF_GUARDED_BY_LOCK(dumpJITMemoryLock) = -1;
</ins><span class="cx">     static uint8_t* buffer;
</span><span class="cx">     static constexpr size_t bufferSize = fixedExecutableMemoryPoolSize;
</span><del>-    static size_t offset = 0;
-    static UncheckedLock dumpJITMemoryLock;
-    static bool needsToFlush = false;
-    static auto flush = [](const AbstractLocker&) {
-        if (fd == -1) {
-            String path = Options::dumpJITMemoryPath();
-            path = path.replace("%pid", String::number(getCurrentProcessID()));
-            fd = open(FileSystem::fileSystemRepresentation(path).data(), O_CREAT | O_TRUNC | O_APPEND | O_WRONLY | O_EXLOCK | O_NONBLOCK, 0666);
-            RELEASE_ASSERT(fd != -1);
</del><ins>+    static size_t offset WTF_GUARDED_BY_LOCK(dumpJITMemoryLock) = 0;
+    static bool needsToFlush WTF_GUARDED_BY_LOCK(dumpJITMemoryLock) = false;
+    static LazyNeverDestroyed<Ref<WorkQueue>> flushQueue;
+    struct DumpJIT {
+        static void flush() WTF_REQUIRES_LOCK(dumpJITMemoryLock)
+        {
+            if (fd == -1) {
+                String path = Options::dumpJITMemoryPath();
+                path = path.replace("%pid", String::number(getCurrentProcessID()));
+                fd = open(FileSystem::fileSystemRepresentation(path).data(), O_CREAT | O_TRUNC | O_APPEND | O_WRONLY | O_EXLOCK | O_NONBLOCK, 0666);
+                RELEASE_ASSERT(fd != -1);
+            }
+            ::write(fd, buffer, offset);
+            offset = 0;
+            needsToFlush = false;
</ins><span class="cx">         }
</span><del>-        write(fd, buffer, offset);
-        offset = 0;
-        needsToFlush = false;
</del><ins>+
+        static void enqueueFlush() WTF_REQUIRES_LOCK(dumpJITMemoryLock)
+        {
+            if (needsToFlush)
+                return;
+
+            needsToFlush = true;
+            flushQueue.get()->dispatchAfter(Seconds(Options::dumpJITMemoryFlushInterval()), [] {
+                Locker locker { dumpJITMemoryLock };
+                if (!needsToFlush)
+                    return;
+                flush();
+            });
+        }
+
+        static void write(const void* src, size_t size) WTF_REQUIRES_LOCK(dumpJITMemoryLock)
+        {
+            if (UNLIKELY(offset + size > bufferSize))
+                flush();
+            memcpy(buffer + offset, src, size);
+            offset += size;
+            enqueueFlush();
+        }
</ins><span class="cx">     };
</span><span class="cx"> 
</span><span class="cx">     static std::once_flag once;
</span><del>-    static LazyNeverDestroyed<Ref<WorkQueue>> flushQueue;
</del><span class="cx">     std::call_once(once, [] {
</span><span class="cx">         buffer = bitwise_cast<uint8_t*>(malloc(bufferSize));
</span><span class="cx">         flushQueue.construct(WorkQueue::create("jsc.dumpJITMemory.queue", WorkQueue::Type::Serial, WorkQueue::QOS::Background));
</span><span class="cx">         std::atexit([] {
</span><span class="cx">             Locker locker { dumpJITMemoryLock };
</span><del>-            flush(locker);
</del><ins>+            DumpJIT::flush();
</ins><span class="cx">             close(fd);
</span><span class="cx">             fd = -1;
</span><span class="cx">         });
</span><span class="cx">     });
</span><span class="cx"> 
</span><del>-    static auto enqueueFlush = [](const AbstractLocker&) {
-        if (needsToFlush)
-            return;
-
-        needsToFlush = true;
-        flushQueue.get()->dispatchAfter(Seconds(Options::dumpJITMemoryFlushInterval()), [] {
-            Locker locker { dumpJITMemoryLock };
-            if (!needsToFlush)
-                return;
-            flush(locker);
-        });
-    };
-
-    static auto write = [](const AbstractLocker& locker, const void* src, size_t size) {
-        if (UNLIKELY(offset + size > bufferSize))
-            flush(locker);
-        memcpy(buffer + offset, src, size);
-        offset += size;
-        enqueueFlush(locker);
-    };
-
</del><span class="cx">     Locker locker { dumpJITMemoryLock };
</span><span class="cx">     uint64_t time = mach_absolute_time();
</span><span class="cx">     uint64_t dst64 = bitwise_cast<uintptr_t>(dst);
</span><span class="cx">     uint64_t size64 = size;
</span><span class="cx">     TraceScope(DumpJITMemoryStart, DumpJITMemoryStop, time, dst64, size64);
</span><del>-    write(locker, &time, sizeof(time));
-    write(locker, &dst64, sizeof(dst64));
-    write(locker, &size64, sizeof(size64));
-    write(locker, src, size);
</del><ins>+    DumpJIT::write(&time, sizeof(time));
+    DumpJIT::write(&dst64, sizeof(dst64));
+    DumpJIT::write(&size64, sizeof(size64));
+    DumpJIT::write(src, size);
</ins><span class="cx"> #else
</span><span class="cx">     UNUSED_PARAM(dst);
</span><span class="cx">     UNUSED_PARAM(src);
</span></span></pre>
</div>
</div>

</body>
</html>