Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

wpiutil: Add Stop() to EventLoopRunner

Browse Source 
This allows stopping the event loop without having to destroy the object.

Also fix ExecSync() to actually wait for the call to complete.
This commit is contained in:
Peter Johnson
2018-11-06 23:27:46 -08:00
parent 19caeca990
commit 76f5d153fa
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wpiutil/src/main/native/cpp/EventLoopRunner.cpp
View File

@@ -44,11 +44,14 @@ class EventLoopRunner::Thread : public SafeThread {
EventLoopRunner::EventLoopRunner() { m_owner.Start(); }
EventLoopRunner::~EventLoopRunner() {
EventLoopRunner::~EventLoopRunner() { Stop(); }
void EventLoopRunner::Stop() {
ExecAsync([](uv::Loop& loop) {
// close all handles; this will (eventually) stop the loop
loop.Walk([](uv::Handle& h) { h.Close(); });
});
m_owner.Join();
}
void EventLoopRunner::ExecAsync(LoopFunc func) {
@@ -60,11 +63,13 @@ void EventLoopRunner::ExecAsync(LoopFunc func) {
}
void EventLoopRunner::ExecSync(LoopFunc func) {
wpi::future<void> f;
if (auto thr = m_owner.GetThread()) {
if (auto doExec = thr->m_doExec.lock()) {
doExec->Call(func);
f = doExec->Call(func);
}
}
if (f.valid()) f.wait();
}
std::shared_ptr<uv::Loop> EventLoopRunner::GetLoop() {