fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-21 04:23:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

px4_poll posix: fix wrap-around for large timeouts

Browse Source 
timeout is an int, so it wraps when the poll timeout is >2147ms.
This happened in logger, resulting in poll never returning.
This commit is contained in:
Beat Küng
2019-05-17 07:53:33 -04:00
committed by Daniel Agar
parent 9d8015d029
commit 011aef5464
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/cdev/posix/cdev_platform.cpp
+1 -1
View File
@@ -377,7 +377,7 @@ extern "C" {
// Calculate an absolute time in the future // Calculate an absolute time in the future
const unsigned billion = (1000 * 1000 * 1000); const unsigned billion = (1000 * 1000 * 1000);
uint64_t nsecs = ts.tv_nsec + (timeout * 1000 * 1000); uint64_t nsecs = ts.tv_nsec + ((uint64_t)timeout * 1000 * 1000);
ts.tv_sec += nsecs / billion; ts.tv_sec += nsecs / billion;
nsecs -= (nsecs / billion) * billion; nsecs -= (nsecs / billion) * billion;
ts.tv_nsec = nsecs; ts.tv_nsec = nsecs;