Skip to content

Fix deadlock in beginJob when compiled debug #269

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

Open
Copilot wants to merge 2 commits into
base: main
Choose a base branch
from
+14 −5
Open

Fix deadlock in beginJob when compiled debug #269

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29b73c5
Initial plan
Copilot May 29, 2026
cb47a4a
fix: resolve deadlock in beginJob when compiled debug
Copilot May 29, 2026
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
19 changes: 14 additions & 5 deletions src/Mu2eEventDisplay_module.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,8 @@ namespace mu2e
// Control between the main thread and event-display thread
std::condition_variable cv_{};
std::mutex m_{};
bool appStarted_{false};
bool eveSetupDone_{false};

int diagLevel_;
bool showCrv_;
Expand Down Expand Up @@ -255,22 +257,28 @@ namespace mu2e
void Mu2eEventDisplay::signalAppStart()
{
std::unique_lock lock{m_};
appStarted_ = true;
cv_.notify_all();
}

void Mu2eEventDisplay::beginJob(){
if(diagLevel_ == 1) std::cout<<"[Mu2eEventDisplay : beginJob()] -- starting ..."<<std::endl;
{
std::unique_lock lock{m_};
appThread_ = std::thread{[this] { run_application(); }};
// Wait for app init to finish ... this will process pending timer events.
XThreadTimer sut([this]{ signalAppStart(); });
if(diagLevel_ == 1) std::cout<<"[Mu2eEventDisplay : beginJob()] -- starting wait on app start"<<std::endl;
cv_.wait(lock);
{
std::unique_lock lock{m_};
if(diagLevel_ == 1) std::cout<<"[Mu2eEventDisplay : beginJob()] -- starting wait on app start"<<std::endl;
cv_.wait(lock, [this]{ return appStarted_; });
}
if(diagLevel_ == 1) std::cout<<"[Mu2eEventDisplay : beginJob()] -- app start signal received, starting eve init"<<std::endl;
XThreadTimer suet([this]{ setup_eve(); });
if(diagLevel_ == 1) std::cout<<"[Mu2eEventDisplay : beginJob()] -- starting wait on eve setup"<<std::endl;
cv_.wait(lock);
{
std::unique_lock lock{m_};
if(diagLevel_ == 1) std::cout<<"[Mu2eEventDisplay : beginJob()] -- starting wait on eve setup"<<std::endl;
cv_.wait(lock, [this]{ return eveSetupDone_; });
}
if(diagLevel_ == 1) std::cout<<"[Mu2eEventDisplay : beginJob()] -- eve setup apparently complete"<<std::endl;
}
}
Expand Down Expand Up @@ -643,6 +651,7 @@ void Mu2eEventDisplay::FillAnyCollection(const art::Event& evt, std::vector<std:
std::unique_lock lock{m_};
// Signal the waiting Art thread (in analyze() or beginRun()) to continue processing
// now that the REve display is fully initialized.
eveSetupDone_ = true;
cv_.notify_all();
//std::cout << "[DEBUG] TextSelect object ID assigned: " << fText->GetElementId() << std::endl;
}
Expand Down