Skip to content

[lldb] Don't report all progress event as completed. #84281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 7, 2024
Merged

[lldb] Don't report all progress event as completed. #84281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions lldb/include/lldb/Core/Progress.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,14 @@ class ProgressManager {

static ProgressManager &Instance();

static void ReportProgress(const Progress::ProgressData &);

private:
enum class EventType {
Begin,
End,
};
static void ReportProgress(const Progress::ProgressData &progress_data,
EventType type);

llvm::StringMap<std::pair<uint64_t, Progress::ProgressData>>
m_progress_category_map;
std::mutex m_progress_map_mutex;
Expand Down
16 changes: 9 additions & 7 deletions lldb/source/Core/Progress.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ void ProgressManager::Increment(const Progress::ProgressData &progress_data) {
// initial progress report.
if (!m_progress_category_map.contains(progress_data.title)) {
m_progress_category_map[progress_data.title].second = progress_data;
ReportProgress(progress_data);
ReportProgress(progress_data, EventType::Begin);
}
m_progress_category_map[progress_data.title].first++;
}
Expand All @@ -110,20 +110,22 @@ void ProgressManager::Decrement(const Progress::ProgressData &progress_data) {
return;

if (pos->second.first <= 1) {
ReportProgress(pos->second.second);
ReportProgress(pos->second.second, EventType::End);
m_progress_category_map.erase(progress_data.title);
} else {
--pos->second.first;
}
}

void ProgressManager::ReportProgress(
const Progress::ProgressData &progress_data) {
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.
Debugger::ReportProgress(
progress_data.progress_id, progress_data.title, "",
Progress::kNonDeterministicTotal, Progress::kNonDeterministicTotal,
progress_data.debugger_id, Debugger::eBroadcastBitProgressCategory);
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,
Debugger::eBroadcastBitProgressCategory);
}
4 changes: 2 additions & 2 deletions lldb/unittests/Core/ProgressReportTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ TEST_F(ProgressReportTest, TestProgressManager) {

ASSERT_EQ(data->GetDetails(), "");
ASSERT_FALSE(data->IsFinite());
ASSERT_TRUE(data->GetCompleted());
ASSERT_FALSE(data->GetCompleted());
ASSERT_EQ(data->GetTotal(), Progress::kNonDeterministicTotal);
ASSERT_EQ(data->GetMessage(), "Progress report 1");

Expand Down Expand Up @@ -199,7 +199,7 @@ TEST_F(ProgressReportTest, TestProgressManager) {

ASSERT_EQ(data->GetDetails(), "");
ASSERT_FALSE(data->IsFinite());
ASSERT_TRUE(data->GetCompleted());
ASSERT_FALSE(data->GetCompleted());
ASSERT_EQ(data->GetTotal(), Progress::kNonDeterministicTotal);
ASSERT_EQ(data->GetMessage(), "Overlapping report 1");

Expand Down