Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-22 00:28:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

DataFlash: added locking for multi-thread logging support

Browse Source
This commit is contained in:
Andrew Tridgell 2015-12-17 09:23:14 +11:00
parent c77e3c89c5
commit 02d7867d79
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libraries/DataFlash/DataFlash_File.cpp
View File

@ -96,6 +96,12 @@ void DataFlash_File::Init()
int ret; int ret;
struct stat st; struct stat st;
semaphore = hal.util->new_semaphore();
if (semaphore == nullptr) {
hal.console->printf("Failed to create DataFlash_File semaphore\n");
return;
}
#if CONFIG_HAL_BOARD == HAL_BOARD_PX4 || CONFIG_HAL_BOARD == HAL_BOARD_VRBRAIN #if CONFIG_HAL_BOARD == HAL_BOARD_PX4 || CONFIG_HAL_BOARD == HAL_BOARD_VRBRAIN
// try to cope with an existing lowercase log directory // try to cope with an existing lowercase log directory
// name. NuttX does not handle case insensitive VFAT well // name. NuttX does not handle case insensitive VFAT well
@ -437,8 +443,13 @@ bool DataFlash_File::WritePrioritisedBlock(const void *pBuffer, uint16_t size, b
return false; return false;
} }
if (!semaphore->take(1)) {
return false;
}
if (! WriteBlockCheckStartupMessages()) { if (! WriteBlockCheckStartupMessages()) {
_dropped++; _dropped++;
semaphore->give();
return false; return false;
} }
@ -453,12 +464,14 @@ bool DataFlash_File::WritePrioritisedBlock(const void *pBuffer, uint16_t size, b
// things: // things:
if (space < non_messagewriter_message_reserved_space()) { if (space < non_messagewriter_message_reserved_space()) {
// this message isn't dropped, it will be sent again... // this message isn't dropped, it will be sent again...
semaphore->give();
return false; return false;
} }
} else { } else {
// we reserve some amount of space for critical messages: // we reserve some amount of space for critical messages:
if (!is_critical && space < critical_message_reserved_space()) { if (!is_critical && space < critical_message_reserved_space()) {
_dropped++; _dropped++;
semaphore->give();
return false; return false;
} }
} }
@ -467,6 +480,7 @@ bool DataFlash_File::WritePrioritisedBlock(const void *pBuffer, uint16_t size, b
if (space < size) { if (space < size) {
hal.util->perf_count(_perf_overruns); hal.util->perf_count(_perf_overruns);
_dropped++; _dropped++;
semaphore->give();
return false; return false;
} }
@ -490,6 +504,7 @@ bool DataFlash_File::WritePrioritisedBlock(const void *pBuffer, uint16_t size, b
BUF_ADVANCETAIL(_writebuf, n); BUF_ADVANCETAIL(_writebuf, n);
} }
} }
semaphore->give();
return true; return true;
} }

2
libraries/DataFlash/DataFlash_File.h
View File

@ -131,6 +131,8 @@ private:
return ret; return ret;
}; };
AP_HAL::Semaphore *semaphore;
// performance counters // performance counters
AP_HAL::Util::perf_counter_t _perf_write; AP_HAL::Util::perf_counter_t _perf_write;
AP_HAL::Util::perf_counter_t _perf_fsync; AP_HAL::Util::perf_counter_t _perf_fsync;