aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_Logger: only write final log out a page at a time to avoid lock contention

Browse Source 
remove health check timing hack
This commit is contained in:
Andy Piper 2020-09-17 22:03:28 +01:00 committed by Andrew Tridgell
parent 4f7047797e
commit dc0084a2b2
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libraries/AP_Logger/AP_Logger_Block.cpp
View File

@ -824,10 +824,8 @@ bool AP_Logger_Block::logging_failed() const
bool AP_Logger_Block::io_thread_alive() const
{
// if the io thread hasn't had a heartbeat in 5s it is dead
// the timeout is longer than might be otherwise required to allow for the FFT running
// at the same priority
return (AP_HAL::millis() - io_timer_heartbeat) < 5000U;
// if the io thread hasn't had a heartbeat in 1s it is dead
return (AP_HAL::millis() - io_timer_heartbeat) < 1000U;
}
/*
@ -896,12 +894,13 @@ void AP_Logger_Block::io_timer(void)
log_write_started = false;
// complete writing any previous log
while (writebuf.available()) {
// complete writing any previous log, a page at a time to avoid holding the lock for too long
if (writebuf.available()) {
write_log_page();
} else {
writebuf.clear();
stop_log_pending = false;
}
writebuf.clear();
stop_log_pending = false;
// write at most one page
} else if (writebuf.available() >= df_PageSize - sizeof(struct PageHeader)) {
@ -909,7 +908,6 @@ void AP_Logger_Block::io_timer(void)
write_log_page();
}
}
// write out a page of log data