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

[sim] Fix HAL notifier race condition (#2606)

Browse Source 
WaitForNotifierAlarm was waiting on the CV without first checking to see if
the exit condition was met.
This commit is contained in:
Peter Johnson
2020-07-20 23:30:14 -07:00
committed by GitHub
parent 49dcf7cf59
commit 33d8363297
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
hal/src/main/native/sim/Notifier.cpp
View File

@@ -157,9 +157,15 @@ uint64_t HAL_WaitForNotifierAlarm(HAL_NotifierHandle notifierHandle,
std::unique_lock lock(notifier->mutex);
while (notifier->active) {
uint64_t curTime = HAL_GetFPGATime(status);
if (notifier->running && curTime >= notifier->waitTime) {
notifier->running = false;
return curTime;
}
double waitTime;
if (!notifier->running || notifiersPaused) {
waitTime = (HAL_GetFPGATime(status) * 1e-6) + 1000.0;
waitTime = (curTime * 1e-6) + 1000.0;
// If not running, wait 1000 seconds
} else {
waitTime = notifier->waitTime * 1e-6;
@@ -168,12 +174,6 @@ uint64_t HAL_WaitForNotifierAlarm(HAL_NotifierHandle notifierHandle,
auto timeoutTime =
hal::fpga_clock::epoch() + std::chrono::duration<double>(waitTime);
notifier->cond.wait_until(lock, timeoutTime);
if (!notifier->running) continue;
if (!notifier->active) break;
uint64_t curTime = HAL_GetFPGATime(status);
if (curTime < notifier->waitTime) continue;
notifier->running = false;
return curTime;
}
return 0;
}