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

Merges changes from master branch to resolve issue with CPU and memory

Browse Source 
and constraints on scheduled thread pool saturation.  Adds a new
scheduled thread pool for each processing chain that the components in
the chain can share, versus the single shared pool exposed by the
threadpoolmanager class.
This commit is contained in:
denny
2016-02-15 15:47:14 -05:00
parent e2a0451bfb
commit f7f6c2fc3e
45 changed files with 170 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/record/RecorderManager.java
View File

@@ -86,10 +86,9 @@ public class RecorderManager implements Listener<AudioPacket>
try
{
RealBufferWaveRecorder recorder =
new RealBufferWaveRecorder( mThreadPoolManager,
AUDIO_SAMPLE_RATE, filePrefix );
new RealBufferWaveRecorder( AUDIO_SAMPLE_RATE, filePrefix );
recorder.start();
recorder.start( mThreadPoolManager.getScheduledExecutorService() );
recorder.receive( audioPacket.getAudioBuffer() );
mRecorders.put( identifier, recorder );
@@ -177,7 +176,6 @@ public class RecorderManager implements Listener<AudioPacket>
sb.append( channelName );
sb.append( "_baseband" );
return new ComplexBufferWaveRecorder( mThreadPoolManager,
AUDIO_SAMPLE_RATE, sb.toString() );
return new ComplexBufferWaveRecorder( AUDIO_SAMPLE_RATE, sb.toString() );
}
}

23
src/record/wave/ComplexBufferWaveRecorder.java
View File

@@ -21,6 +21,7 @@ import java.io.IOException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -38,8 +39,6 @@ import sample.Listener;
import sample.complex.ComplexBuffer;
import sample.complex.IComplexBufferListener;
import util.TimeStamp;
import controller.ThreadPoolManager;
import controller.ThreadPoolManager.ThreadType;
/**
* WAVE audio recorder module for recording complex (I&Q) samples to a wave file
@@ -55,18 +54,14 @@ public class ComplexBufferWaveRecorder extends Module
private Path mFile;
private AudioFormat mAudioFormat;
private ThreadPoolManager mThreadPoolManager;
private BufferProcessor mBufferProcessor;
private ScheduledFuture<?> mProcessorHandle;
private LinkedBlockingQueue<ComplexBuffer> mBuffers = new LinkedBlockingQueue<>( 500 );
private AtomicBoolean mRunning = new AtomicBoolean();
public ComplexBufferWaveRecorder( ThreadPoolManager threadPoolManager,
int sampleRate, String filePrefix )
public ComplexBufferWaveRecorder( int sampleRate, String filePrefix )
{
mThreadPoolManager = threadPoolManager;
mAudioFormat = new AudioFormat( sampleRate, //SampleRate
16, //Sample Size
2, //Channels
@@ -81,7 +76,7 @@ public class ComplexBufferWaveRecorder extends Module
return mFile;
}
public void start()
public void start( ScheduledExecutorService executor )
{
if( mRunning.compareAndSet( false, true ) )
{
@@ -103,9 +98,8 @@ public class ComplexBufferWaveRecorder extends Module
mWriter = new WaveWriter( mAudioFormat, mFile );
/* Schedule the processor to run every 500 milliseconds */
mProcessorHandle = mThreadPoolManager.scheduleFixedRate(
ThreadType.BASEBAND_RECORDING, mBufferProcessor, 500,
TimeUnit.MILLISECONDS );
mProcessorHandle = executor.scheduleAtFixedRate(
mBufferProcessor, 0, 500, TimeUnit.MILLISECONDS );
}
catch( IOException io )
{
@@ -149,8 +143,6 @@ public class ComplexBufferWaveRecorder extends Module
public void dispose()
{
stop();
mThreadPoolManager = null;
}
@Override
@@ -190,7 +182,10 @@ public class ComplexBufferWaveRecorder extends Module
mFile = null;
mThreadPoolManager.cancel( mProcessorHandle );
if( mProcessorHandle != null )
{
mProcessorHandle.cancel( true );
}
mProcessorHandle = null;
}

26
src/record/wave/RealBufferWaveRecorder.java
View File

@@ -21,6 +21,7 @@ import java.io.IOException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -37,8 +38,6 @@ import sample.Listener;
import sample.real.IFilteredRealBufferListener;
import sample.real.RealBuffer;
import util.TimeStamp;
import controller.ThreadPoolManager;
import controller.ThreadPoolManager.ThreadType;
/**
* WAVE audio recorder module for recording real sample buffers to a wave file
@@ -54,7 +53,6 @@ public class RealBufferWaveRecorder extends Module
private Path mFile;
private AudioFormat mAudioFormat;
private ThreadPoolManager mThreadPoolManager;
private BufferProcessor mBufferProcessor;
private ScheduledFuture<?> mProcessorHandle;
private LinkedBlockingQueue<RealBuffer> mBuffers =
@@ -63,11 +61,8 @@ public class RealBufferWaveRecorder extends Module
private AtomicBoolean mRunning = new AtomicBoolean();
public RealBufferWaveRecorder( ThreadPoolManager threadPoolManager,
int sampleRate, String filePrefix )
public RealBufferWaveRecorder( int sampleRate, String filePrefix )
{
mThreadPoolManager = threadPoolManager;
mAudioFormat = new AudioFormat( sampleRate, //SampleRate
16, //Sample Size
1, //Channels
@@ -90,7 +85,7 @@ public class RealBufferWaveRecorder extends Module
return mFile;
}
public void start()
public void start( ScheduledExecutorService executor )
{
if( mRunning.compareAndSet( false, true ) )
{
@@ -112,9 +107,8 @@ public class RealBufferWaveRecorder extends Module
mWriter = new WaveWriter( mAudioFormat, mFile );
/* Schedule the processor to run every 500 milliseconds */
mProcessorHandle = mThreadPoolManager.scheduleFixedRate(
ThreadType.AUDIO_RECORDING, mBufferProcessor, 500,
TimeUnit.MILLISECONDS );
mProcessorHandle = executor.scheduleAtFixedRate(
mBufferProcessor, 0, 500, TimeUnit.MILLISECONDS );
}
catch( IOException io )
{
@@ -160,8 +154,6 @@ public class RealBufferWaveRecorder extends Module
public void dispose()
{
stop();
mThreadPoolManager = null;
}
@Override
@@ -198,12 +190,14 @@ public class RealBufferWaveRecorder extends Module
}
}
mThreadPoolManager.cancel( mProcessorHandle );
if( mProcessorHandle != null )
{
mProcessorHandle.cancel( true );
}
mProcessorHandle = null;
mWriter = null;
mFile = null;
mProcessorHandle = null;
mThreadPoolManager = null;
}
else
{