AFG/dump1090
3
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Wait for at most 100ms for more data from the rx thread, so that we do not starve background tasks if the rx thread blocks (e.g on USB disconnect).

Browse source 
Fixes #20.
This commit is contained in:
Oliver Jowett 2015-02-17 21:07:36 +00:00
parent aee837c903
commit 03e096475c
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
dump1090.c
View file

@ -988,16 +988,27 @@ int main(int argc, char **argv) {
struct timespec start_time; struct timespec start_time;
if (Modes.iDataReady == 0) { if (Modes.iDataReady == 0) {
pthread_cond_wait(&Modes.data_cond,&Modes.data_mutex); // This unlocks Modes.data_mutex, and waits for Modes.data_cond /* wait for more data.
continue; // Once (Modes.data_cond) occurs, it locks Modes.data_mutex * we should be getting data every 50-60ms. wait for max 100ms before we give up and do some background work.
* this is fairly aggressive as all our network I/O runs out of the background work!
*/
struct timespec ts;
clock_gettime(CLOCK_REALTIME, &ts);
ts.tv_nsec += 100000000;
normalize_timespec(&ts);
pthread_cond_timedwait(&Modes.data_cond, &Modes.data_mutex, &ts); // This unlocks Modes.data_mutex, and waits for Modes.data_cond
// Once (Modes.data_cond) occurs, it locks Modes.data_mutex
} }
// Modes.data_mutex is Locked, and possibly (Modes.iDataReady != 0)
// copy out reader CPU time and reset it // copy out reader CPU time and reset it
add_timespecs(&Modes.reader_cpu_accumulator, &Modes.stats_current.reader_cpu, &Modes.stats_current.reader_cpu); add_timespecs(&Modes.reader_cpu_accumulator, &Modes.stats_current.reader_cpu, &Modes.stats_current.reader_cpu);
Modes.reader_cpu_accumulator.tv_sec = 0; Modes.reader_cpu_accumulator.tv_sec = 0;
Modes.reader_cpu_accumulator.tv_nsec = 0; Modes.reader_cpu_accumulator.tv_nsec = 0;
// Modes.data_mutex is Locked, and (Modes.iDataReady != 0)
if (Modes.iDataReady) { // Check we have new data, just in case!! if (Modes.iDataReady) { // Check we have new data, just in case!!
start_cpu_timing(&start_time); start_cpu_timing(&start_time);