GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-14 01:27:34 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Resolves #905. Adds try/catch block to duplicate call detection processing block to ensure that any error generated during duplicate call processing doesn't kill the processing thread and cause a queue-backup memory leak. (#918)

Browse Source 
Co-authored-by: Denny <denny@denny-desktop>
This commit is contained in:
Denny Sheirer
2020-09-03 04:07:30 -04:00
committed by GitHub
parent eaa3433034
commit e1f32d3d0b
1 changed files with 59 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
src/main/java/io/github/dsheirer/audio/DuplicateCallDetector.java
View File

@@ -231,80 +231,88 @@ public class DuplicateCallDetector implements Listener<AudioSegment>
*/ */
private void process() private void process()
{ {
//Transfer in newly arrived audio segments try
mAudioSegmentQueue.drainTo(mAudioSegments);
//Remove any completed audio segments.
mAudioSegments.removeIf(audioSegment -> {
boolean complete = audioSegment.completeProperty().get();
if(complete)
{
audioSegment.decrementConsumerCount();
}
return complete;
});
//Only check for duplicates if there is more than one call
if(mAudioSegments.size() > 1)
{ {
List<AudioSegment> duplicates = new ArrayList<>(); //Transfer in newly arrived audio segments
mAudioSegmentQueue.drainTo(mAudioSegments);
int currentIndex = 0; //Remove any completed audio segments.
while(currentIndex < mAudioSegments.size() - 1) mAudioSegments.removeIf(audioSegment -> {
{ boolean complete = audioSegment.completeProperty().get();
AudioSegment current = mAudioSegments.get(currentIndex);
if(!current.isDuplicate()) if(complete)
{ {
int checkIndex = currentIndex + 1; audioSegment.decrementConsumerCount();
}
while(checkIndex < mAudioSegments.size()) return complete;
});
//Only check for duplicates if there is more than one call
if(mAudioSegments.size() > 1)
{
List<AudioSegment> duplicates = new ArrayList<>();
int currentIndex = 0;
while(currentIndex < mAudioSegments.size() - 1)
{
AudioSegment current = mAudioSegments.get(currentIndex);
if(!current.isDuplicate())
{ {
AudioSegment toCheck = mAudioSegments.get(checkIndex); int checkIndex = currentIndex + 1;
if(!toCheck.isDuplicate()) while(checkIndex < mAudioSegments.size())
{ {
if(isDuplicate(current, toCheck)) AudioSegment toCheck = mAudioSegments.get(checkIndex);
if(!toCheck.isDuplicate())
{ {
toCheck.setDuplicate(true); if(isDuplicate(current, toCheck))
toCheck.decrementConsumerCount(); {
duplicates.add(toCheck); toCheck.setDuplicate(true);
toCheck.decrementConsumerCount();
duplicates.add(toCheck);
}
} }
checkIndex++;
} }
checkIndex++;
} }
currentIndex++;
} }
currentIndex++; mAudioSegments.removeAll(duplicates);
} }
mAudioSegments.removeAll(duplicates); //Finally, if the audio segment queue is empty, shutdown montitoring until a new segment arrives
} if(mAudioSegments.isEmpty())
//Finally, if the audio segment queue is empty, shutdown montitoring until a new segment arrives
if(mAudioSegments.isEmpty())
{
//Block on the audio segment queue so that we can shutdown before any new segments are added, and
//allow the add(segment) to restart monitoring as soon as needed.
synchronized(mAudioSegmentQueue)
{ {
if(mAudioSegmentQueue.isEmpty()) //Block on the audio segment queue so that we can shutdown before any new segments are added, and
//allow the add(segment) to restart monitoring as soon as needed.
synchronized(mAudioSegmentQueue)
{ {
try if(mAudioSegmentQueue.isEmpty())
{ {
stopMonitoring(); try
} {
catch(Exception e) stopMonitoring();
{ }
mLog.error("Unexpected error during duplicate audio segment monitoring shutdown", e); catch(Exception e)
//Do nothing, we got interrupted {
mLog.error("Unexpected error during duplicate audio segment monitoring shutdown", e);
//Do nothing, we got interrupted
}
} }
} }
} }
} }
catch(Throwable t)
{
mLog.error("Unknown error while processing audio segments for duplicate call detection. Please report " +
"this to the developer.", t);
}
} }
} }
} }