Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-18 06:38:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

DataFlash: method to flush ringbuffer to fd

Browse Source
This commit is contained in:
Peter Barker 2015-06-19 11:57:01 +10:00 committed by Andrew Tridgell
parent 686b1137fa
commit c5c39a77a3
5 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/DataFlash/DataFlash.cpp
View File

@ -66,5 +66,11 @@ void DataFlash_Class::EnableWrites(bool enable) {
backend->EnableWrites(enable);
}
#if CONFIG_HAL_BOARD == HAL_BOARD_SITL || CONFIG_HAL_BOARD == HAL_BOARD_LINUX
// currently only DataFlash_File support this:
void DataFlash_Class::flush(void) {
backend->flush();
}
#endif
// end functions pass straight through to backend

5
libraries/DataFlash/DataFlash.h
View File

@ -104,6 +104,11 @@ public:
bool logging_started(void);
#if CONFIG_HAL_BOARD == HAL_BOARD_SITL || CONFIG_HAL_BOARD == HAL_BOARD_LINUX
// currently only DataFlash_File support this:
void flush(void);
#endif
protected:
void Log_Fill_Format(const struct LogStructure *structure, struct log_Format &pkt);
void Log_Write_Parameter(const AP_Param *ap, const AP_Param::ParamToken &token,

5
libraries/DataFlash/DataFlash_Backend.h
View File

@ -68,6 +68,11 @@ public:
void Log_Fill_Format(const struct LogStructure *structure, struct log_Format &pkt);
#if CONFIG_HAL_BOARD == HAL_BOARD_SITL || CONFIG_HAL_BOARD == HAL_BOARD_LINUX
// currently only DataFlash_File support this:
virtual void flush(void) { }
#endif
protected:
DataFlash_Class &_front;

19
libraries/DataFlash/DataFlash_File.cpp
View File

@ -608,6 +608,25 @@ void DataFlash_File::ListAvailableLogs(AP_HAL::BetterStream *port)
port->println();
}
#if CONFIG_HAL_BOARD == HAL_BOARD_SITL || CONFIG_HAL_BOARD == HAL_BOARD_LINUX
void DataFlash_File::flush(void)
{
uint16_t _tail;
uint32_t tnow = hal.scheduler->micros();
hal.scheduler->suspend_timer_procs();
while (_write_fd != -1 && _initialised && !_open_error &&
BUF_AVAILABLE(_writebuf)) {
// convince the IO timer that it really is OK to write out
// less than _writebuf_chunk bytes:
_last_write_time = tnow - 2000000;
_io_timer();
}
hal.scheduler->resume_timer_procs();
if (_write_fd != -1) {
::fsync(_write_fd);
}
}
#endif
void DataFlash_File::_io_timer(void)
{

4
libraries/DataFlash/DataFlash_File.h
View File

@ -53,6 +53,10 @@ public:
void ShowDeviceInfo(AP_HAL::BetterStream *port);
void ListAvailableLogs(AP_HAL::BetterStream *port);
#if CONFIG_HAL_BOARD == HAL_BOARD_SITL || CONFIG_HAL_BOARD == HAL_BOARD_LINUX
void flush(void);
#endif
private:
int _write_fd;
int _read_fd;