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

AP_Logger: remove perf counters

Browse Source
This commit is contained in:
Peter Barker 2021-01-06 21:25:05 +11:00 committed by Peter Barker
parent b3946a667c
commit 80e8688888
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/AP_Logger/AP_Logger_File.cpp
View File

@ -50,11 +50,7 @@ AP_Logger_File::AP_Logger_File(AP_Logger &front,
_read_fd(-1),
_log_directory(log_directory),
_writebuf(0),
_writebuf_chunk(HAL_LOGGER_WRITE_CHUNK_SIZE),
_perf_write(hal.util->perf_alloc(AP_HAL::Util::PC_ELAPSED, "DF_write")),
_perf_fsync(hal.util->perf_alloc(AP_HAL::Util::PC_ELAPSED, "DF_fsync")),
_perf_errors(hal.util->perf_alloc(AP_HAL::Util::PC_COUNT, "DF_errors")),
_perf_overruns(hal.util->perf_alloc(AP_HAL::Util::PC_COUNT, "DF_overruns"))
_writebuf_chunk(HAL_LOGGER_WRITE_CHUNK_SIZE)
{
df_stats_clear();
}
@ -503,7 +499,6 @@ bool AP_Logger_File::_WritePrioritisedBlock(const void *pBuffer, uint16_t size,
// if no room for entire message - drop it:
if (space < size) {
hal.util->perf_count(_perf_overruns);
_dropped++;
return false;
}
@ -897,8 +892,6 @@ void AP_Logger_File::io_timer(void)
last_io_operation = "";
}
hal.util->perf_begin(_perf_write);
_last_write_time = tnow;
if (nbytes > _writebuf_chunk) {
// be kind to the filesystem layer
@ -932,7 +925,6 @@ void AP_Logger_File::io_timer(void)
// if we can't write for LOG_FILE_TIMEOUT seconds we give up and close
// the file. This allows us to cope with temporary write
// failures caused by directory listing
hal.util->perf_count(_perf_errors);
last_io_operation = "close";
AP::FS().close(_write_fd);
last_io_operation = "";
@ -971,7 +963,6 @@ void AP_Logger_File::io_timer(void)
}
write_fd_semaphore.give();
hal.util->perf_end(_perf_write);
}
bool AP_Logger_File::io_thread_alive() const

6
libraries/AP_Logger/AP_Logger_File.h
View File

@ -121,12 +121,6 @@ private:
// can open/close files without causing the backend to write to a
// bad fd
HAL_Semaphore write_fd_semaphore;
// performance counters
AP_HAL::Util::perf_counter_t _perf_write;
AP_HAL::Util::perf_counter_t _perf_fsync;
AP_HAL::Util::perf_counter_t _perf_errors;
AP_HAL::Util::perf_counter_t _perf_overruns;
const char *last_io_operation = "";
};