Changeset 215715 in webkit for trunk/Source/JavaScriptCore/tools

Timestamp:

Apr 24, 2017, 7:53:49 PM (8 years ago)

Author:

Yusuke Suzuki

Message:

[WTF] Move JSC tools/StackTrace to WTF and unify stack trace dump code
​https://bugs.webkit.org/show_bug.cgi?id=171199

Reviewed by Mark Lam.

Source/JavaScriptCore:

This patch adds a utility method to produce demangled names with dladdr.
It fixes several memory leaks because the result of abi::cxa_demangle()
needs to be free-ed.

• CMakeLists.txt:
• JavaScriptCore.xcodeproj/project.pbxproj:
• inspector/JSGlobalObjectInspectorController.cpp:

(Inspector::JSGlobalObjectInspectorController::appendAPIBacktrace):

• runtime/SamplingProfiler.cpp:

(JSC::SamplingProfiler::StackFrame::displayName):

• tools/CellProfile.h:
• tools/CodeProfile.cpp:

(JSC::CodeProfile::report):
(JSC::symbolName): Deleted.

Source/WTF:

JSC tools/StackTrace's dump code is almost identical to WTF Assertions'
stack trace dump code. This patch moves tools/StackTrace to WTF and use
it in Assertions. It unifies the two duplicate implementations into one.

• WTF.xcodeproj/project.pbxproj:
• wtf/Assertions.cpp:
• wtf/CMakeLists.txt:
• wtf/Platform.h:
• wtf/StackTrace.cpp: Renamed from Source/JavaScriptCore/tools/StackTrace.cpp.

(WTF::StackTrace::captureStackTrace):
(WTF::StackTrace::dump):

• wtf/StackTrace.h: Copied from Source/JavaScriptCore/tools/StackTrace.h.

(WTF::StackTrace::StackTrace):
(WTF::StackTrace::stack):
(WTF::StackTrace::DemangleEntry::mangledName):
(WTF::StackTrace::DemangleEntry::demangledName):
(WTF::StackTrace::DemangleEntry::DemangleEntry):

• wtf/SystemFree.h: Renamed from Source/JavaScriptCore/tools/StackTrace.h.

(WTF::SystemFree::operator()):

Location:

trunk/Source/JavaScriptCore/tools

Files:

• CellProfile.h (modified) (1 diff)
• CodeProfile.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/tools/CellProfile.h

@@ -27 +27 @@
 
 #include "JSCell.h"
-#include "StackTrace.h"
 #include "Structure.h"
 #include <wtf/MonotonicTime.h>
+#include <wtf/StackTrace.h>
 
 namespace JSC {

trunk/Source/JavaScriptCore/tools/CodeProfile.cpp

@@ -31 +31 @@
 #include "LinkBuffer.h"
 #include "ProfileTreeNode.h"
+#include <wtf/StackTrace.h>
 #include <wtf/text/WTFString.h>
-
-#if OS(DARWIN) || OS(LINUX)
-#include <cxxabi.h>
-#include <dlfcn.h>
-#include <execinfo.h>
-#endif
 
 namespace JSC {
@@ -52 +47 @@
     "[[EngineFrame]]"
 };
-
-// Helper function, find the symbol name for a pc in JSC.
-static const char* symbolName(void* address)
-{
-#if OS(DARWIN) || OS(LINUX)
-    Dl_info info;
-    if (!dladdr(address, &info) || !info.dli_sname)
-        return "<unknown>";
-
-    const char* mangledName = info.dli_sname;
-    const char* cxaDemangled = abi::__cxa_demangle(mangledName, 0, 0, 0);
-    return cxaDemangled ? cxaDemangled : mangledName;
-#else
-    UNUSED_PARAM(address);
-    return "<unknown>";
-#endif
-}
 
 // Helper function, truncate traces to prune the output & make very verbose mode a little more readable.
@@ -168 +146 @@
             --lastEngineFrame;
             ASSERT(m_samples[lastEngineFrame].type == EngineFrame);
-            const char* name = symbolName(m_samples[lastEngineFrame].pc);
+            const char* name = "<unknown>";
+            auto demangled = StackTrace::demangle(m_samples[lastEngineFrame].pc);
+            if (demangled)
+                name = demangled->demangledName() ? demangled->demangledName() : demangled->mangledName();
             callbacks = callbacks->sampleChild(name);
             if (truncateTrace(name))