Skip to content

Add worker poll thread guard #41

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
manke-cubert merged 1 commit into from
Aug 15, 2025
Merged

Add worker poll thread guard #41

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
16 changes: 9 additions & 7 deletions interface/cuvis.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1526,9 +1526,9 @@ namespace cuvis
std::shared_ptr<CUVIS_WORKER> _worker;


std::atomic_bool _worker_poll_thread_run;

std::thread _worker_poll_thread;
std::atomic_bool _worker_poll_thread_run = false;
mutable std::mutex _worker_poll_thread_lock;
std::shared_ptr<std::thread> _worker_poll_thread;
};

/** \cond INTERNAL */
Expand Down Expand Up @@ -2216,10 +2216,10 @@ namespace cuvis
reset_worker_callback();

static const std::chrono::milliseconds poll_time = std::chrono::milliseconds(1);

std::lock_guard<std::mutex> lock(_worker_poll_thread_lock);
_worker_poll_thread_run = true;

_worker_poll_thread = std::thread([this, callback, concurrency, measurement_timeout_ms]
_worker_poll_thread = std::make_shared<std::thread>([this, callback, concurrency, measurement_timeout_ms]
{
std::deque<std::future<void>> async_tasks;
while (_worker_poll_thread_run.load())
Expand Down Expand Up @@ -2261,10 +2261,12 @@ namespace cuvis

inline void Worker::reset_worker_callback()
{
std::lock_guard<std::mutex> lock(_worker_poll_thread_lock);
_worker_poll_thread_run = false;
if (_worker_poll_thread.joinable())
if (_worker_poll_thread && _worker_poll_thread->joinable())
{
_worker_poll_thread.join();
_worker_poll_thread->join();
_worker_poll_thread.reset();
}
}

Expand Down