For high-frequency multithreaded progress reports, the contention of taking the progress mutex and the overhead of generating event can significantly slow down the operation whose progress we are reporting. This patch adds an (optional) capability to rate-limit them. It's optional because this approach has one drawback: if the progress reporting has a pattern where it generates a burst of activity and then blocks (without reporting anything) for a large amount of time, it can appear as if less progress was made that it actually was (because we only reported the first event from the burst and dropped the other ones). I've also made a small refactor of the Progress class to better distinguish between const (don't need protection), atomic (are used on the hot path) and other (need mutex protection) members.
226 lines
7.6 KiB
C++
226 lines
7.6 KiB
C++
//===-- Progress.cpp ------------------------------------------------------===//
|
|
//
|
|
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
|
// See https://llvm.org/LICENSE.txt for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "lldb/Core/Progress.h"
|
|
|
|
#include "lldb/Core/Debugger.h"
|
|
#include "lldb/Utility/StreamString.h"
|
|
#include "llvm/Support/Signposts.h"
|
|
#include <atomic>
|
|
#include <chrono>
|
|
#include <cstdint>
|
|
#include <mutex>
|
|
#include <optional>
|
|
|
|
using namespace lldb;
|
|
using namespace lldb_private;
|
|
|
|
std::atomic<uint64_t> Progress::g_id(0);
|
|
|
|
// Instrument progress events with signposts when supported.
|
|
static llvm::ManagedStatic<llvm::SignpostEmitter> g_progress_signposts;
|
|
|
|
Progress::Progress(std::string title, std::string details,
|
|
std::optional<uint64_t> total,
|
|
lldb_private::Debugger *debugger,
|
|
Timeout<std::nano> minimum_report_time)
|
|
: m_total(total.value_or(Progress::kNonDeterministicTotal)),
|
|
m_minimum_report_time(minimum_report_time),
|
|
m_progress_data{title, ++g_id,
|
|
debugger ? std::optional<user_id_t>(debugger->GetID())
|
|
: std::nullopt},
|
|
m_last_report_time_ns(
|
|
std::chrono::nanoseconds(
|
|
std::chrono::steady_clock::now().time_since_epoch())
|
|
.count()),
|
|
m_details(std::move(details)) {
|
|
std::lock_guard<std::mutex> guard(m_mutex);
|
|
ReportProgress();
|
|
|
|
// Report to the ProgressManager if that subsystem is enabled.
|
|
if (ProgressManager::Enabled())
|
|
ProgressManager::Instance().Increment(m_progress_data);
|
|
|
|
// Start signpost interval right before the meaningful work starts.
|
|
g_progress_signposts->startInterval(this, m_progress_data.title);
|
|
}
|
|
|
|
Progress::~Progress() {
|
|
// End signpost interval as soon as possible.
|
|
g_progress_signposts->endInterval(this, m_progress_data.title);
|
|
|
|
// Make sure to always report progress completed when this object is
|
|
// destructed so it indicates the progress dialog/activity should go away.
|
|
std::lock_guard<std::mutex> guard(m_mutex);
|
|
m_completed = m_total;
|
|
ReportProgress();
|
|
|
|
// Report to the ProgressManager if that subsystem is enabled.
|
|
if (ProgressManager::Enabled())
|
|
ProgressManager::Instance().Decrement(m_progress_data);
|
|
}
|
|
|
|
void Progress::Increment(uint64_t amount,
|
|
std::optional<std::string> updated_detail) {
|
|
if (amount == 0)
|
|
return;
|
|
|
|
m_completed.fetch_add(amount, std::memory_order_relaxed);
|
|
|
|
if (m_minimum_report_time) {
|
|
using namespace std::chrono;
|
|
|
|
nanoseconds now;
|
|
uint64_t last_report_time_ns =
|
|
m_last_report_time_ns.load(std::memory_order_relaxed);
|
|
|
|
do {
|
|
now = steady_clock::now().time_since_epoch();
|
|
if (now < nanoseconds(last_report_time_ns) + *m_minimum_report_time)
|
|
return; // Too little time has passed since the last report.
|
|
|
|
} while (!m_last_report_time_ns.compare_exchange_weak(
|
|
last_report_time_ns, now.count(), std::memory_order_relaxed,
|
|
std::memory_order_relaxed));
|
|
}
|
|
|
|
std::lock_guard<std::mutex> guard(m_mutex);
|
|
if (updated_detail)
|
|
m_details = std::move(updated_detail.value());
|
|
ReportProgress();
|
|
}
|
|
|
|
void Progress::ReportProgress() {
|
|
// NB: Comparisons with optional<T> rely on the fact that std::nullopt is
|
|
// "smaller" than zero.
|
|
if (m_prev_completed >= m_total)
|
|
return; // We've reported completion already.
|
|
|
|
uint64_t completed =
|
|
std::min(m_completed.load(std::memory_order_relaxed), m_total);
|
|
if (completed < m_prev_completed)
|
|
return; // An overflow in the m_completed counter. Just ignore these events.
|
|
|
|
Debugger::ReportProgress(m_progress_data.progress_id, m_progress_data.title,
|
|
m_details, completed, m_total,
|
|
m_progress_data.debugger_id);
|
|
m_prev_completed = completed;
|
|
}
|
|
|
|
ProgressManager::ProgressManager()
|
|
: m_entries(), m_alarm(std::chrono::milliseconds(100)) {}
|
|
|
|
ProgressManager::~ProgressManager() {}
|
|
|
|
void ProgressManager::Initialize() {
|
|
assert(!InstanceImpl() && "Already initialized.");
|
|
InstanceImpl().emplace();
|
|
}
|
|
|
|
void ProgressManager::Terminate() {
|
|
assert(InstanceImpl() && "Already terminated.");
|
|
InstanceImpl().reset();
|
|
}
|
|
|
|
bool ProgressManager::Enabled() { return InstanceImpl().operator bool(); }
|
|
|
|
ProgressManager &ProgressManager::Instance() {
|
|
assert(InstanceImpl() && "ProgressManager must be initialized");
|
|
return *InstanceImpl();
|
|
}
|
|
|
|
std::optional<ProgressManager> &ProgressManager::InstanceImpl() {
|
|
static std::optional<ProgressManager> g_progress_manager;
|
|
return g_progress_manager;
|
|
}
|
|
|
|
void ProgressManager::Increment(const Progress::ProgressData &progress_data) {
|
|
std::lock_guard<std::mutex> lock(m_entries_mutex);
|
|
|
|
llvm::StringRef key = progress_data.title;
|
|
bool new_entry = !m_entries.contains(key);
|
|
Entry &entry = m_entries[progress_data.title];
|
|
|
|
if (new_entry) {
|
|
// This is a new progress event. Report progress and store the progress
|
|
// data.
|
|
ReportProgress(progress_data, EventType::Begin);
|
|
entry.data = progress_data;
|
|
} else if (entry.refcount == 0) {
|
|
// This is an existing entry that was scheduled to be deleted but a new one
|
|
// came in before the timer expired.
|
|
assert(entry.handle != Alarm::INVALID_HANDLE);
|
|
|
|
if (!m_alarm.Cancel(entry.handle)) {
|
|
// The timer expired before we had a chance to cancel it. We have to treat
|
|
// this as an entirely new progress event.
|
|
ReportProgress(progress_data, EventType::Begin);
|
|
}
|
|
// Clear the alarm handle.
|
|
entry.handle = Alarm::INVALID_HANDLE;
|
|
}
|
|
|
|
// Regardless of how we got here, we need to bump the reference count.
|
|
entry.refcount++;
|
|
}
|
|
|
|
void ProgressManager::Decrement(const Progress::ProgressData &progress_data) {
|
|
std::lock_guard<std::mutex> lock(m_entries_mutex);
|
|
llvm::StringRef key = progress_data.title;
|
|
|
|
auto it = m_entries.find(key);
|
|
if (it == m_entries.end())
|
|
return;
|
|
|
|
Entry &entry = it->second;
|
|
entry.refcount--;
|
|
|
|
if (entry.refcount == 0) {
|
|
assert(entry.handle == Alarm::INVALID_HANDLE);
|
|
|
|
// Copy the key to a std::string so we can pass it by value to the lambda.
|
|
// The underlying StringRef will not exist by the time the callback is
|
|
// called.
|
|
std::string key_str = std::string(key);
|
|
|
|
// Start a timer. If it expires before we see another progress event, it
|
|
// will be reported.
|
|
entry.handle = m_alarm.Create([=]() { Expire(key_str); });
|
|
}
|
|
}
|
|
|
|
void ProgressManager::ReportProgress(
|
|
const Progress::ProgressData &progress_data, EventType type) {
|
|
// The category bit only keeps track of when progress report categories have
|
|
// started and ended, so clear the details and reset other fields when
|
|
// broadcasting to it since that bit doesn't need that information.
|
|
const uint64_t completed =
|
|
(type == EventType::Begin) ? 0 : Progress::kNonDeterministicTotal;
|
|
Debugger::ReportProgress(progress_data.progress_id, progress_data.title, "",
|
|
completed, Progress::kNonDeterministicTotal,
|
|
progress_data.debugger_id,
|
|
lldb::eBroadcastBitProgressCategory);
|
|
}
|
|
|
|
void ProgressManager::Expire(llvm::StringRef key) {
|
|
std::lock_guard<std::mutex> lock(m_entries_mutex);
|
|
|
|
// This shouldn't happen but be resilient anyway.
|
|
if (!m_entries.contains(key))
|
|
return;
|
|
|
|
// A new event came in and the alarm fired before we had a chance to restart
|
|
// it.
|
|
if (m_entries[key].refcount != 0)
|
|
return;
|
|
|
|
// We're done with this entry.
|
|
ReportProgress(m_entries[key].data, EventType::End);
|
|
m_entries.erase(key);
|
|
}
|