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

fix infinite loop when not logging

Browse Source
This commit is contained in:
Mark Whitehorn
2016-05-14 11:27:07 +02:00
committed by Lorenz Meier
parent f40afac448
commit 26596dbe15
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/logger/log_writer.cpp
+12 -14
View File
@@ -103,21 +103,20 @@ void *LogWriter::run_helper(void *context)
void LogWriter::run() void LogWriter::run()
{ {
// Wait for _should_run flag
while (!_exit_thread) {
bool start = false;
pthread_mutex_lock(&_mtx);
pthread_cond_wait(&_cv, &_mtx);
start = _should_run;
pthread_mutex_unlock(&_mtx);
if (start) {
break;
}
}
while (!_exit_thread) { while (!_exit_thread) {
// Outer endless loop // Outer endless loop
// Wait for _should_run flag
while (!_exit_thread) {
bool start = false;
pthread_mutex_lock(&_mtx);
pthread_cond_wait(&_cv, &_mtx);
start = _should_run;
pthread_mutex_unlock(&_mtx);
if (start) {
break;
}
}
int poll_count = 0; int poll_count = 0;
int written = 0; int written = 0;
@@ -196,7 +195,6 @@ void LogWriter::run()
break; break;
} }
} }
} }
} }