Changeset 245499 in webkit

Timestamp:

May 18, 2019, 12:12:17 AM (7 years ago)

Author:

Tadeu Zagallo

Message:

Add extra information to dumpJITMemory
​https://bugs.webkit.org/show_bug.cgi?id=197998

Reviewed by Saam Barati.

Source/JavaScriptCore:

Add ktrace events around the memory dump and mach_absolute_time to link the
events with the entries in the dump. Additionally, add a background queue
to flush on a configurable interval, since the atexit callback does not work
in every situation.

• jit/ExecutableAllocator.cpp:

(JSC::dumpJITMemory):

• runtime/Options.h:

Source/WTF:

Add a new trace point code for JSC::dumpJITMemory

• wtf/SystemTracing.h:

Tools:

Add description for the new dumpJITMemory trace point code.

• Tracing/SystemTracePoints.plist:

Location:

trunk

Files:

• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/jit/ExecutableAllocator.cpp (modified) (3 diffs)
• Source/JavaScriptCore/runtime/Options.h (modified) (1 diff)
• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/SystemTracing.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Tracing/SystemTracePoints.plist (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-05-18  Tadeu Zagallo  <tzagallo@apple.com>
+
+        Add extra information to dumpJITMemory
+        https://bugs.webkit.org/show_bug.cgi?id=197998
+
+        Reviewed by Saam Barati.
+
+        Add ktrace events around the memory dump and mach_absolute_time to link the
+        events with the entries in the dump. Additionally, add a background queue
+        to flush on a configurable interval, since the atexit callback does not work
+        in every situation.
+
+        * jit/ExecutableAllocator.cpp:
+        (JSC::dumpJITMemory):
+        * runtime/Options.h:
+
 2019-05-17  Justin Michaud  <justin_michaud@apple.com>
 

trunk/Source/JavaScriptCore/jit/ExecutableAllocator.cpp

@@ -34 +34 @@
 #include <wtf/MetaAllocator.h>
 #include <wtf/PageReservation.h>
+#include <wtf/SystemTracing.h>
+#include <wtf/WorkQueue.h>
 
 #if OS(DARWIN)
+#include <mach/mach_time.h>
 #include <sys/mman.h>
 #endif
@@ -560 +563 @@
     static constexpr size_t bufferSize = fixedExecutableMemoryPoolSize;
     static size_t offset = 0;
-    static auto flush = [] {
+    static Lock dumpJITMemoryLock;
+    static bool needsToFlush = false;
+    static auto flush = [](const AbstractLocker&) {
         if (fd == -1) {
             fd = open(Options::dumpJITMemoryPath(), O_CREAT | O_TRUNC | O_APPEND | O_WRONLY | O_EXLOCK | O_NONBLOCK, 0666);
@@ -567 +572 @@
         write(fd, buffer, offset);
         offset = 0;
+        needsToFlush = false;
     };
 
-    static Lock dumpJITMemoryLock;
     static std::once_flag once;
+    static LazyNeverDestroyed<Ref<WorkQueue>> flushQueue;
     std::call_once(once, [] {
         buffer = bitwise_cast<uint8_t*>(malloc(bufferSize));
+        flushQueue.construct(WorkQueue::create("jsc.dumpJITMemory.queue", WorkQueue::Type::Serial, WorkQueue::QOS::Background));
         std::atexit([] {
             LockHolder locker(dumpJITMemoryLock);
-            flush();
+            flush(locker);
             close(fd);
+            fd = -1;
         });
     });
 
-    static auto write = [](const void* src, size_t size) {
+    static auto enqueueFlush = [](const AbstractLocker&) {
+        if (needsToFlush)
+            return;
+
+        needsToFlush = true;
+        flushQueue.get()->dispatchAfter(Seconds(Options::dumpJITMemoryFlushInterval()), [] {
+            LockHolder 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();
+            flush(locker);
         memcpy(buffer + offset, src, size);
         offset += size;
+        enqueueFlush(locker);
     };
 
     LockHolder locker(dumpJITMemoryLock);
+    uint64_t time = mach_absolute_time();
     uint64_t dst64 = bitwise_cast<uintptr_t>(dst);
-    write(&dst64, sizeof(dst64));
     uint64_t size64 = size;
-    write(&size64, sizeof(size64));
-    write(src, size);
+    TraceScope(DumpJITMemoryStart, DumpJITMemoryStop, time, dst64, size64);
+    write(locker, &time, sizeof(time));
+    write(locker, &dst64, sizeof(dst64));
+    write(locker, &size64, sizeof(size64));
+    write(locker, src, size);
 #else
     UNUSED_PARAM(dst);

trunk/Source/JavaScriptCore/runtime/Options.h

@@ -520 +520 @@
     v(double, validateAbstractInterpreterStateProbability, 0.5, Normal, nullptr) \
     v(optionString, dumpJITMemoryPath, nullptr, Restricted, nullptr) \
+    v(double, dumpJITMemoryFlushInterval, 10, Restricted, "Maximum time in between flushes of the JIT memory dump in seconds.") \
 
 

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2019-05-18  Tadeu Zagallo  <tzagallo@apple.com>
+
+        Add extra information to dumpJITMemory
+        https://bugs.webkit.org/show_bug.cgi?id=197998
+
+        Reviewed by Saam Barati.
+
+        Add a new trace point code for JSC::dumpJITMemory
+
+        * wtf/SystemTracing.h:
+
 2019-05-17  Don Olmstead  <don.olmstead@sony.com>
 

trunk/Source/WTF/wtf/SystemTracing.h

@@ -48 +48 @@
     WebAssemblyExecuteStart,
     WebAssemblyExecuteEnd,
+    DumpJITMemoryStart,
+    DumpJITMemoryStop,
 
     WebCoreRange = 5000,

trunk/Tools/ChangeLog

@@ +1 @@
+2019-05-18  Tadeu Zagallo  <tzagallo@apple.com>
+
+        Add extra information to dumpJITMemory
+        https://bugs.webkit.org/show_bug.cgi?id=197998
+
+        Reviewed by Saam Barati.
+
+        Add description for the new dumpJITMemory trace point code.
+
+        * Tracing/SystemTracePoints.plist:
+
 2019-05-17  Justin Michaud  <justin_michaud@apple.com>
 

trunk/Tools/Tracing/SystemTracePoints.plist

@@ -46 +46 @@
              <dict>
                  <key>Name</key>
+                 <string>Dump JIT Memory</string>
+                 <key>Type</key>
+                 <string>Interval</string>
+                 <key>Component</key>
+                 <string>47</string>
+                 <key>CodeBegin</key>
+                 <string>2507</string>
+                 <key>CodeEnd</key>
+                 <string>2508</string>
+             </dict>
+             <dict>
+                 <key>Name</key>
                  <string>Main Resource Load</string>
                  <key>Type</key>