Skip to content
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

Fix C++ version of MonitorStage output issue caused by out of order function calls #2140

Merged
merged 5 commits into from
Jan 28, 2025
Merged

Fix C++ version of MonitorStage output issue caused by out of order function calls #2140

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
604c38d
fix race condition
yczhang-nv Jan 28, 2025
44b83d4
fix doc
yczhang-nv Jan 28, 2025
2bb8832
fix format
yczhang-nv Jan 28, 2025
9b08545
Merge branch 'branch-25.02' into yuchen-fix-monitor-stage-log-issue
yczhang-nv Jan 28, 2025
4c3975c
Update python/morpheus/morpheus/_lib/include/morpheus/controllers/mon…
dagardner-nv Jan 28, 2025
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
10 changes: 8 additions & 2 deletions python/morpheus/morpheus/_lib/include/morpheus/controllers/monitor_controller.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,12 @@ class ProgressBarContextManager
{
std::lock_guard<std::mutex> lock(m_mutex);

// To avoid display_all() being executed after calling mark_pbar_as_completed() in some race conditions
if (m_is_completed)
{
return;
}

// A bit of hack here to make the font settings work. Indicators enables the font options only if the bars are
// output to standard streams (see is_colorized() in <indicators/termcolor.hpp>), but since we are still using
// the ostream (m_stdout_os) that is connected to the console terminal, the font options should be enabled.
Expand All @@ -114,11 +120,11 @@ class ProgressBarContextManager
{
pbar->print_progress(true);
m_stdout_os << termcolor::reset; // The font option only works for the current bar
m_stdout_os << "\n";
m_stdout_os << std::endl;
}

// After each round of display, move cursor up ("\033[A") to the beginning of the first bar
m_stdout_os << "\033[" << m_progress_bars.size() << "A";
m_stdout_os << "\033[" << m_progress_bars.size() << "A" << std::flush;
}

void mark_pbar_as_completed(size_t bar_id)
Expand Down