fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-18 01:10:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

logger: fix resource leaks in LogWriter

Browse Source
This commit is contained in:
Beat Küng
2016-05-09 16:34:18 +02:00
committed by Lorenz Meier
parent d3a9930b50
commit da1e63eaf3
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/logger/log_writer.cpp
+11 -6
View File
@@ -52,8 +52,8 @@ LogWriter::LogWriter(size_t buffer_size) :
pthread_mutex_init(&_mtx, nullptr);
pthread_cond_init(&_cv, nullptr);
/* allocate write performance counters */
perf_write = perf_alloc(PC_ELAPSED, "sd write");
perf_fsync = perf_alloc(PC_ELAPSED, "sd fsync");
_perf_write = perf_alloc(PC_ELAPSED, "sd write");
_perf_fsync = perf_alloc(PC_ELAPSED, "sd fsync");
}
bool LogWriter::init()
@@ -69,6 +69,11 @@ bool LogWriter::init()
LogWriter::~LogWriter()
{
pthread_mutex_destroy(&_mtx);
pthread_cond_destroy(&_cv);
perf_free(_perf_write);
perf_free(_perf_fsync);
if (_buffer) {
delete[] _buffer;
}
@@ -185,15 +190,15 @@ void LogWriter::run()
written = 0;
if (available > 0) {
perf_begin(perf_write);
perf_begin(_perf_write);
written = ::write(_fd, read_ptr, available);
perf_end(perf_write);
perf_end(_perf_write);
/* call fsync periodically to minimize potential loss of data */
if (++poll_count >= 100) {
perf_begin(perf_fsync);
perf_begin(_perf_fsync);
::fsync(_fd);
perf_end(perf_fsync);
perf_end(_perf_fsync);
poll_count = 0;
}