Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-30 02:31:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

[artf3749] Repaired undefined behavior in takeMultiWait.

Browse Source 
Change-Id: Ieae7d602472f585db2a896cc76355a5c23d1d670
This commit is contained in:
James Kuszmaul
2014-11-08 14:27:49 -05:00
parent 19737ba443
commit f67849a9b1
8 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wpilibc/wpilibC++Sim/src/Timer.cpp
View File

@@ -28,7 +28,8 @@ void Wait(double seconds)
double start = wpilib::internal::simTime;
while ((wpilib::internal::simTime - start) < seconds) {
takeMultiWait(wpilib::internal::time_wait, 0);
takeMultiWait(wpilib::internal::time_wait,
wpilib::internal::time_wait_mutex, 0);
}
}
@@ -203,6 +204,7 @@ extern "C"
namespace wpilib { namespace internal {
double simTime = 0;
MULTIWAIT_ID time_wait = initializeMultiWait();
MUTEX_ID time_wait_mutex = initializeMutexNormal();
void time_callback(const msgs::ConstFloat64Ptr &msg) {
simTime = msg->data();