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

[ntcore] Fix WaitForListenerQueue (#4662)

Browse Source
This commit is contained in:
Peter Johnson
2022-11-18 14:01:52 -08:00
committed by GitHub
parent 388e7a4265
commit 295a1f8f3b
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
ntcore/src/main/native/cpp/ListenerStorage.cpp
View File

@@ -36,17 +36,16 @@ void ListenerStorage::Thread::Main() {
}
// call all the way back out to the C++ API to ensure valid handle
auto events = nt::ReadListenerQueue(m_poller);
if (events.empty()) {
continue;
}
std::unique_lock lock{m_mutex};
for (auto&& event : events) {
auto callbackIt = m_callbacks.find(event.listener);
if (callbackIt != m_callbacks.end()) {
auto callback = callbackIt->second;
lock.unlock();
callback(event);
lock.lock();
if (!events.empty()) {
std::unique_lock lock{m_mutex};
for (auto&& event : events) {
auto callbackIt = m_callbacks.find(event.listener);
if (callbackIt != m_callbacks.end()) {
auto callback = callbackIt->second;
lock.unlock();
callback(event);
lock.lock();
}
}
}
if (std::find(signaled.begin(), signaled.end(),
@@ -308,16 +307,19 @@ ListenerStorage::RemoveListener(NT_Listener listenerHandle) {
}
bool ListenerStorage::WaitForListenerQueue(double timeout) {
std::scoped_lock lock{m_mutex};
WPI_EventHandle h;
if (auto thr = m_thread.GetThread()) {
h = thr->m_waitQueueWaiter.GetHandle();
thr->m_waitQueueWakeup.Set();
} else {
return false;
{
std::scoped_lock lock{m_mutex};
if (auto thr = m_thread.GetThread()) {
h = thr->m_waitQueueWaiter.GetHandle();
thr->m_waitQueueWakeup.Set();
} else {
return false;
}
}
bool timedOut;
return wpi::WaitForObject(h, timeout, &timedOut);
wpi::WaitForObject(h, timeout, &timedOut);
return !timedOut;
}
void ListenerStorage::Reset() {