diff --git a/lldb/include/lldb/Utility/Instrumentation.h b/lldb/include/lldb/Utility/Instrumentation.h --- a/lldb/include/lldb/Utility/Instrumentation.h +++ b/lldb/include/lldb/Utility/Instrumentation.h @@ -86,6 +86,8 @@ private: void UpdateBoundary(); + llvm::StringRef m_pretty_func; + /// Whether this function call was the one crossing the API boundary. bool m_local_boundary = false; }; diff --git a/lldb/source/Utility/Instrumentation.cpp b/lldb/source/Utility/Instrumentation.cpp --- a/lldb/source/Utility/Instrumentation.cpp +++ b/lldb/source/Utility/Instrumentation.cpp @@ -6,6 +6,8 @@ //===----------------------------------------------------------------------===// #include "lldb/Utility/Instrumentation.h" +#include "llvm/Support/Signposts.h" + #include #include #include @@ -17,21 +19,25 @@ // Whether we're currently across the API boundary. static thread_local bool g_global_boundary = false; +// Instrument SB API calls with singposts when supported. +static llvm::ManagedStatic g_api_signposts; + Instrumenter::Instrumenter(llvm::StringRef pretty_func, std::string &&pretty_args) - : m_local_boundary(false) { + : m_pretty_func(pretty_func), m_local_boundary(false) { if (!g_global_boundary) { g_global_boundary = true; m_local_boundary = true; + g_api_signposts->startInterval(this, m_pretty_func); } LLDB_LOG(GetLogIfAllCategoriesSet(LIBLLDB_LOG_API), "[{0}] {1} ({2})", - m_local_boundary ? "external" : "internal", pretty_func, + m_local_boundary ? "external" : "internal", m_pretty_func, pretty_args); } -Instrumenter::~Instrumenter() { UpdateBoundary(); } - -void Instrumenter::UpdateBoundary() { - if (m_local_boundary) +Instrumenter::~Instrumenter() { + if (m_local_boundary) { g_global_boundary = false; + g_api_signposts->endInterval(this, m_pretty_func); + } }