Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 16:25:31 +03:00
Code Issues Wiki Activity

Reduce standard deviation of flash logging execution time by 80%

Browse source
This commit is contained in:
Nicholas Sherlock 2015-06-30 17:43:49 +12:00
parent bf18f212d9
commit 4f860dd6f1
2 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/blackbox/blackbox.c
View file

@ -1215,6 +1215,9 @@ static void blackboxLogIteration()
#endif #endif
} }
//Flush every iteration so that our runtime variance is minimized
blackboxDeviceFlush();
blackboxSlowFrameIterationTimer++; blackboxSlowFrameIterationTimer++;
blackboxIteration++; blackboxIteration++;
blackboxPFrameIndex++; blackboxPFrameIndex++;

17
src/main/io/flashfs.c
View file

@ -52,12 +52,9 @@ static uint32_t tailAddress = 0;
// The index of the tail within the flash page it is inside // The index of the tail within the flash page it is inside
static uint16_t tailIndexInPage = 0; static uint16_t tailIndexInPage = 0;
static bool shouldFlush = false;
static void flashfsClearBuffer() static void flashfsClearBuffer()
{ {
bufferTail = bufferHead = 0; bufferTail = bufferHead = 0;
shouldFlush = false;
} }
static bool flashfsBufferIsEmpty() static bool flashfsBufferIsEmpty()
@ -293,15 +290,14 @@ static void flashfsAdvanceTailInBuffer(uint32_t delta)
} }
/** /**
* If the flash is ready to accept writes, flush the buffer to it, otherwise schedule * If the flash is ready to accept writes, flush the buffer to it.
* a flush for later and return immediately.
* *
* Returns true if all data in the buffer has been flushed to the device. * Returns true if all data in the buffer has been flushed to the device, or false if
* there is still data to be written (call flush again later).
*/ */
bool flashfsFlushAsync() bool flashfsFlushAsync()
{ {
if (flashfsBufferIsEmpty()) { if (flashfsBufferIsEmpty()) {
shouldFlush = false;
return true; // Nothing to flush return true; // Nothing to flush
} }
@ -313,8 +309,6 @@ bool flashfsFlushAsync()
bytesWritten = flashfsWriteBuffers(buffers, bufferSizes, 2, false); bytesWritten = flashfsWriteBuffers(buffers, bufferSizes, 2, false);
flashfsAdvanceTailInBuffer(bytesWritten); flashfsAdvanceTailInBuffer(bytesWritten);
shouldFlush = !flashfsBufferIsEmpty();
return flashfsBufferIsEmpty(); return flashfsBufferIsEmpty();
} }
@ -327,7 +321,6 @@ bool flashfsFlushAsync()
void flashfsFlushSync() void flashfsFlushSync()
{ {
if (flashfsBufferIsEmpty()) { if (flashfsBufferIsEmpty()) {
shouldFlush = false;
return; // Nothing to flush return; // Nothing to flush
} }
@ -366,7 +359,7 @@ void flashfsWriteByte(uint8_t byte)
bufferHead = 0; bufferHead = 0;
} }
if (shouldFlush || flashfsTransmitBufferUsed() >= FLASHFS_WRITE_BUFFER_AUTO_FLUSH_LEN) { if (flashfsTransmitBufferUsed() >= FLASHFS_WRITE_BUFFER_AUTO_FLUSH_LEN) {
flashfsFlushAsync(); flashfsFlushAsync();
} }
} }
@ -393,7 +386,7 @@ void flashfsWrite(const uint8_t *data, unsigned int len, bool sync)
* Would writing this data to our buffer cause our buffer to reach the flush threshold? If so try to write through * Would writing this data to our buffer cause our buffer to reach the flush threshold? If so try to write through
* to the flash now * to the flash now
*/ */
if (shouldFlush || bufferSizes[0] + bufferSizes[1] + bufferSizes[2] >= FLASHFS_WRITE_BUFFER_AUTO_FLUSH_LEN) { if (bufferSizes[0] + bufferSizes[1] + bufferSizes[2] >= FLASHFS_WRITE_BUFFER_AUTO_FLUSH_LEN) {
uint32_t bytesWritten; uint32_t bytesWritten;
// Attempt to write all three buffers through to the flash asynchronously // Attempt to write all three buffers through to the flash asynchronously