Skip to content
Merged
Changes from all commits
Commits
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: 5 additions & 5 deletions interface/cuvis.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1400,7 +1400,7 @@ namespace cuvis

worker_state_t get_state() const;

void register_worker_callback(worker_callback_t callback, unsigned concurrency = 1);
void register_worker_callback(worker_callback_t callback, unsigned concurrency = 1, size_t measurement_timeout_ms = 1000);

void reset_worker_callback();

Expand Down Expand Up @@ -2053,20 +2053,20 @@ namespace cuvis
return out;
}


inline void Worker::register_worker_callback(worker_callback_t callback, unsigned concurrency)
inline void Worker::register_worker_callback(worker_callback_t callback, unsigned concurrency, size_t measurement_timeout_ms)
{
reset_worker_callback();

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

_worker_poll_thread_run = true;

_worker_poll_thread = std::thread([this, callback, concurrency] {
_worker_poll_thread = std::thread([this, callback, concurrency, measurement_timeout_ms]
{
std::deque<std::future<void>> async_tasks;
while (_worker_poll_thread_run.load())
{
auto ret = get_next_result(std::chrono::milliseconds(1000));
auto ret = get_next_result(std::chrono::milliseconds(measurement_timeout_ms));

if (ret.mesu.has_value())
{
Expand Down