Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HAL_SITL: fixed sleep time with speedup 

and removed sleep in threads for cygwin, as granulatity of sleep is
too high, resuling in very poor lua performance
This commit is contained in:
Andrew Tridgell 2022-11-07 10:25:52 +11:00
parent 6a3c7f8cf6
commit 1488edb1d8
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libraries/AP_HAL_SITL/SITL_State.cpp
View File

@ -175,11 +175,27 @@ void SITL_State::_fdm_input_step(void)
void SITL_State::wait_clock(uint64_t wait_time_usec)
{
float speedup = sitl_model->get_speedup();
if (speedup < 1) {
// for purposes of sleeps treat low speedups as 1
speedup = 1.0;
}
while (AP_HAL::micros64() < wait_time_usec) {
if (hal.scheduler->in_main_thread() ||
Scheduler::from(hal.scheduler)->semaphore_wait_hack_required()) {
_fdm_input_step();
} else {
#ifdef CYGWIN_BUILD
if (speedup > 2) {
// this effectively does a yield of the CPU. The
// granularity of sleeps on cygwin is very high, so
// this is needed for good thread performance. We
// don't do this at low speedups as it causes the cpu
// to run hot
usleep(0);
continue;
}
#endif
usleep(1000);
}
}
@ -187,7 +203,7 @@ void SITL_State::wait_clock(uint64_t wait_time_usec)
// MAVProxy/pymavlink take too long to process packets and it ends
// up seeing traffic well into our past and hits time-out
// conditions.
if (sitl_model->get_speedup() > 1) {
if (speedup > 1 && hal.scheduler->in_main_thread()) {
while (true) {
const int queue_length = ((HALSITL::UARTDriver*)hal.serial(0))->get_system_outqueue_length();
// ::fprintf(stderr, "queue_length=%d\n", (signed)queue_length);