Skip to content

fix(execution): eliminate lost wakeup and signal confusion in EventQueue #35

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
MorganCaron merged 1 commit into from
Sep 20, 2026
Merged

fix(execution): eliminate lost wakeup and signal confusion in EventQueue #35

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
29 changes: 18 additions & 11 deletions modules/Execution/EventQueue.mpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,15 @@ export namespace CppUtils::Execution
inline EventQueue():
m_worker{
[this] { workerThread(); },
[this] { m_condition.notify_all(); }}
[this] { m_workCondition.notify_all(); }}
{
m_worker.start();
}

inline ~EventQueue()
{
waitUntilFinished();
m_worker.stop();
}

EventQueue(const EventQueue&) = delete;
Expand Down Expand Up @@ -77,10 +78,10 @@ export namespace CppUtils::Execution
auto predicate = [this, &accessor] { return std::ranges::empty(accessor.value()) and not m_isTaskRunning; };
if (timeout == Duration::zero())
{
m_condition.wait(accessor.getLockGuard(), predicate);
m_finishedCondition.wait(accessor.getLockGuard(), predicate);
return true;
}
return m_condition.wait_for(accessor.getLockGuard(), timeout, predicate);
return m_finishedCondition.wait_for(accessor.getLockGuard(), timeout, predicate);
}

private:
Expand All @@ -90,15 +91,15 @@ export namespace CppUtils::Execution
auto accessor = m_queue.access();
accessor.value().push(std::move(task));
}
m_condition.notify_one();
m_workCondition.notify_one();
}

inline auto workerThread() -> void
{
auto task = std::function<void()>{};
{
auto accessor = m_queue.access();
m_condition.wait(accessor.getLockGuard(), [this, &accessor] {
m_workCondition.wait(accessor.getLockGuard(), [this, &accessor] {
return not std::ranges::empty(accessor.value()) or m_worker.isStopRequested();
});

Expand All @@ -109,18 +110,24 @@ export namespace CppUtils::Execution
task = std::move(accessor.value().front());
accessor.value().pop();
}

auto _ = ScopeGuard{[this] {
{
auto accessor = m_queue.access();
m_isTaskRunning = false;
}
m_finishedCondition.notify_all();
}};

if (task)
{
auto _ = ScopeGuard{[this] { m_isTaskRunning = false; }};
task();
}
m_condition.notify_all();
}

EventDispatcher m_dispatcher;
Thread::UniqueLocker<std::queue<std::function<void()>>> m_queue;
std::condition_variable m_condition;
std::condition_variable m_workCondition;
std::condition_variable m_finishedCondition;
Thread::ThreadLoop m_worker;
std::atomic<bool> m_isTaskRunning = false;
bool m_isTaskRunning = false;
};
}
Loading