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

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

View File

@@ -1,6 +1,7 @@
package audio; package audio;
import java.util.Arrays; import java.util.Arrays;
import java.util.concurrent.ScheduledExecutorService;
import module.Module; import module.Module;
@@ -72,7 +73,7 @@ public class AudioModule extends Module implements IAudioPacketProvider,
} }
@Override @Override
public void start() public void start( ScheduledExecutorService executor )
{ {
/* No start operations provided */ /* No start operations provided */
} }

View File

@@ -42,6 +42,11 @@ public class ThreadPoolManager
{ {
} }
public ScheduledExecutorService getScheduledExecutorService()
{
return mExecutor;
}
public ScheduledFuture<?> scheduleFixedRate( ThreadType type, public ScheduledFuture<?> scheduleFixedRate( ThreadType type,
Runnable command, Runnable command,
long period, long period,

View File

@@ -185,7 +185,7 @@ public class ChannelProcessingManager implements ChannelEventListener
if( processingChain == null ) if( processingChain == null )
{ {
processingChain = new ProcessingChain( mThreadPoolManager, processingChain = new ProcessingChain( channel.getName(),
channel.getChannelType() ); channel.getChannelType() );
/* Register global listeners */ /* Register global listeners */

View File

@@ -15,7 +15,7 @@ public class InstrumentableProcessingChain extends ProcessingChain implements In
{ {
public InstrumentableProcessingChain() public InstrumentableProcessingChain()
{ {
super( ChannelType.STANDARD ); super( "instrumented", ChannelType.STANDARD );
} }
public void setSource( Source source ) throws IllegalStateException public void setSource( Source source ) throws IllegalStateException

View File

@@ -18,6 +18,8 @@
package module; package module;
import java.util.concurrent.ScheduledExecutorService;
public abstract class Module public abstract class Module
{ {
/** /**
@@ -57,9 +59,9 @@ public abstract class Module
public abstract void reset(); public abstract void reset();
/** /**
* Start processing. * Start processing. Provides an executor to use for scheduling tasks
*/ */
public abstract void start(); public abstract void start( ScheduledExecutorService executor );
/** /**
* Stop processing * Stop processing

View File

@@ -19,7 +19,8 @@ package module;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.ScheduledFuture; import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import message.IMessageListener; import message.IMessageListener;
@@ -67,6 +68,7 @@ import audio.metadata.Metadata;
import audio.squelch.ISquelchStateListener; import audio.squelch.ISquelchStateListener;
import audio.squelch.ISquelchStateProvider; import audio.squelch.ISquelchStateProvider;
import audio.squelch.SquelchState; import audio.squelch.SquelchState;
import controller.NamingThreadFactory;
import controller.ThreadPoolManager; import controller.ThreadPoolManager;
import controller.channel.Channel.ChannelType; import controller.channel.Channel.ChannelType;
import controller.channel.ChannelEvent; import controller.channel.ChannelEvent;
@@ -108,8 +110,8 @@ public class ProcessingChain implements IChannelEventListener
private Broadcaster<RealBuffer> mUnFilteredRealBufferBroadcaster = new Broadcaster<>(); private Broadcaster<RealBuffer> mUnFilteredRealBufferBroadcaster = new Broadcaster<>();
private Broadcaster<SquelchState> mSquelchStateBroadcaster = new Broadcaster<>(); private Broadcaster<SquelchState> mSquelchStateBroadcaster = new Broadcaster<>();
private ThreadPoolManager mThreadPoolManager; private ScheduledExecutorService mScheduledExecutorService;
private ScheduledFuture<?> mBufferProcessingTask; private String mName;
private AtomicBoolean mRunning = new AtomicBoolean(); private AtomicBoolean mRunning = new AtomicBoolean();
protected Source mSource; protected Source mSource;
@@ -118,18 +120,17 @@ public class ProcessingChain implements IChannelEventListener
private ChannelState mChannelState; private ChannelState mChannelState;
private MessageActivityModel mMessageActivityModel; private MessageActivityModel mMessageActivityModel;
public ProcessingChain( ChannelType channelType ) /**
* Creates a processing chain for managing a set of modules
*
* @param name for thread pool naming each thread
* @param channelType
*/
public ProcessingChain( String name, ChannelType channelType )
{ {
this( new ThreadPoolManager(), channelType ); mName = name;
}
mChannelState = new ChannelState( channelType );
public ProcessingChain( ThreadPoolManager threadManager,
ChannelType channelType )
{
mThreadPoolManager = threadManager;
mChannelState = new ChannelState( mThreadPoolManager, channelType );
addModule( mChannelState ); addModule( mChannelState );
mCallEventModel = new CallEventModel(); mCallEventModel = new CallEventModel();
@@ -169,10 +170,6 @@ public class ProcessingChain implements IChannelEventListener
mModules.clear(); mModules.clear();
mThreadPoolManager = null;
mBufferProcessingTask = null;
mAudioPacketBroadcaster.dispose(); mAudioPacketBroadcaster.dispose();
mCallEventBroadcaster.dispose(); mCallEventBroadcaster.dispose();
mChannelEventBroadcaster.dispose(); mChannelEventBroadcaster.dispose();
@@ -445,19 +442,6 @@ public class ProcessingChain implements IChannelEventListener
module.reset(); module.reset();
} }
/* Start each of the modules */
for( Module module: mModules )
{
try
{
module.start();
}
catch( Exception e )
{
mLog.error( "Error starting module", e );
}
}
/* Register with the source to receive sample data. Setup a /* Register with the source to receive sample data. Setup a
* timer task to process the buffer queues 50 times a second * timer task to process the buffer queues 50 times a second
* (every 20 ms) */ * (every 20 ms) */
@@ -492,8 +476,22 @@ public class ProcessingChain implements IChannelEventListener
{ {
mLog.error( "Error getting frequency from tuner channel source", e ); mLog.error( "Error getting frequency from tuner channel source", e );
} }
}
tcs.start(); mScheduledExecutorService = Executors.newScheduledThreadPool(
1, new NamingThreadFactory( "channel " + mName ) );
/* Start each of the modules */
for( Module module: mModules )
{
try
{
module.start( mScheduledExecutorService );
}
catch( Exception e )
{
mLog.error( "Error starting module", e );
}
} }
for( Listener<RealBuffer> listener: mUnFilteredRealBufferBroadcaster.getListeners() ) for( Listener<RealBuffer> listener: mUnFilteredRealBufferBroadcaster.getListeners() )
@@ -536,12 +534,6 @@ public class ProcessingChain implements IChannelEventListener
mSource = null; mSource = null;
} }
if( mBufferProcessingTask != null )
{
mThreadPoolManager.cancel( mBufferProcessingTask );
mBufferProcessingTask = null;
}
/* Stop each of the modules */ /* Stop each of the modules */
for( Module module: mModules ) for( Module module: mModules )
{ {

View File

@@ -18,6 +18,8 @@
package module.decode.am; package module.decode.am;
import java.util.concurrent.ScheduledExecutorService;
import module.decode.DecoderType; import module.decode.DecoderType;
import module.decode.PrimaryDecoder; import module.decode.PrimaryDecoder;
import module.decode.config.DecodeConfiguration; import module.decode.config.DecodeConfiguration;
@@ -41,7 +43,7 @@ public class AMDecoder extends PrimaryDecoder
} }
@Override @Override
public void start() public void start( ScheduledExecutorService executor )
{ {
} }

View File

@@ -25,6 +25,7 @@ import instrument.tap.stream.FloatBufferTap;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.ScheduledExecutorService;
import module.decode.Decoder; import module.decode.Decoder;
import module.decode.DecoderType; import module.decode.DecoderType;
@@ -180,7 +181,7 @@ public class Fleetsync2Decoder extends Decoder implements IFilteredRealBufferLis
} }
@Override @Override
public void start() public void start( ScheduledExecutorService executor )
{ {
} }

View File

@@ -19,6 +19,7 @@ package module.decode.fleetsync2;
import java.util.Iterator; import java.util.Iterator;
import java.util.TreeSet; import java.util.TreeSet;
import java.util.concurrent.ScheduledExecutorService;
import message.Message; import message.Message;
import module.decode.DecoderType; import module.decode.DecoderType;
@@ -58,7 +59,7 @@ public class Fleetsync2DecoderState extends DecoderState
} }
@Override @Override
public void start() public void start( ScheduledExecutorService executor )
{ {
} }

View File

@@ -26,6 +26,7 @@ import instrument.tap.stream.FloatTap;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.ScheduledExecutorService;
import module.decode.Decoder; import module.decode.Decoder;
import module.decode.DecoderType; import module.decode.DecoderType;
@@ -198,7 +199,7 @@ public class LJ1200Decoder extends Decoder implements IFilteredRealBufferListene
} }
@Override @Override
public void start() public void start( ScheduledExecutorService executor )
{ {
} }

View File

@@ -22,6 +22,7 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.TreeSet; import java.util.TreeSet;
import java.util.concurrent.ScheduledExecutorService;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -58,7 +59,7 @@ public class LJ1200DecoderState extends DecoderState
} }
@Override @Override
public void start() public void start( ScheduledExecutorService executor )
{ {
} }

View File

@@ -23,6 +23,7 @@ import instrument.tap.TapGroup;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.ScheduledExecutorService;
import message.MessageDirection; import message.MessageDirection;
import module.decode.Decoder; import module.decode.Decoder;
@@ -120,7 +121,7 @@ public class LTRNetDecoder extends Decoder
} }
@Override @Override
public void start() public void start( ScheduledExecutorService executor )
{ {
} }

View File

@@ -21,6 +21,7 @@ import java.text.DecimalFormat;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.TreeSet; import java.util.TreeSet;
import java.util.concurrent.ScheduledExecutorService;
import message.Message; import message.Message;
import module.decode.DecoderType; import module.decode.DecoderType;
@@ -777,7 +778,7 @@ public class LTRNetDecoderState extends DecoderState
} }
@Override @Override
public void start() public void start( ScheduledExecutorService executor )
{ {
} }

View File

@@ -17,6 +17,8 @@
******************************************************************************/ ******************************************************************************/
package module.decode.ltrstandard; package module.decode.ltrstandard;
import java.util.concurrent.ScheduledExecutorService;
import message.MessageDirection; import message.MessageDirection;
import module.decode.Decoder; import module.decode.Decoder;
import module.decode.DecoderType; import module.decode.DecoderType;
@@ -83,7 +85,7 @@ public class LTRStandardDecoder extends Decoder implements IUnFilteredRealBuffer
} }
@Override @Override
public void start() public void start( ScheduledExecutorService executor )
{ {
} }

View File

@@ -22,6 +22,7 @@ import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.TreeSet; import java.util.TreeSet;
import java.util.concurrent.ScheduledExecutorService;
import message.Message; import message.Message;
import module.decode.DecoderType; import module.decode.DecoderType;
@@ -61,7 +62,7 @@ public class LTRStandardDecoderState extends DecoderState
} }
@Override @Override
public void start() public void start( ScheduledExecutorService executor )
{ {
} }

View File

@@ -26,6 +26,7 @@ import instrument.tap.stream.FloatTap;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.ScheduledExecutorService;
import module.decode.Decoder; import module.decode.Decoder;
import module.decode.DecoderType; import module.decode.DecoderType;
@@ -210,7 +211,7 @@ public class MDCDecoder extends Decoder implements IFilteredRealBufferListener,
} }
@Override @Override
public void start() public void start( ScheduledExecutorService executor )
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub

View File

@@ -19,6 +19,7 @@ package module.decode.mdc1200;
import java.util.Iterator; import java.util.Iterator;
import java.util.TreeSet; import java.util.TreeSet;
import java.util.concurrent.ScheduledExecutorService;
import message.Message; import message.Message;
import module.decode.DecoderType; import module.decode.DecoderType;
@@ -54,7 +55,7 @@ public class MDCDecoderState extends DecoderState
} }
@Override @Override
public void start() public void start( ScheduledExecutorService executor )
{ {
} }

View File

@@ -26,6 +26,7 @@ import instrument.tap.stream.FloatTap;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.ScheduledExecutorService;
import module.decode.Decoder; import module.decode.Decoder;
import module.decode.DecoderType; import module.decode.DecoderType;
@@ -306,7 +307,7 @@ public class MPT1327Decoder extends Decoder
} }
@Override @Override
public void start() public void start( ScheduledExecutorService executor )
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub

View File

@@ -23,6 +23,7 @@ import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.TreeSet; import java.util.TreeSet;
import java.util.concurrent.ScheduledExecutorService;
import message.Message; import message.Message;
import module.decode.DecoderType; import module.decode.DecoderType;
@@ -85,7 +86,7 @@ public class MPT1327DecoderState extends DecoderState
} }
@Override @Override
public void start() public void start( ScheduledExecutorService executor )
{ {
} }

View File

@@ -17,6 +17,8 @@
******************************************************************************/ ******************************************************************************/
package module.decode.nbfm; package module.decode.nbfm;
import java.util.concurrent.ScheduledExecutorService;
import module.decode.DecoderType; import module.decode.DecoderType;
import module.decode.PrimaryDecoder; import module.decode.PrimaryDecoder;
import module.decode.config.DecodeConfiguration; import module.decode.config.DecodeConfiguration;
@@ -40,7 +42,7 @@ public class NBFMDecoder extends PrimaryDecoder
} }
@Override @Override
public void start() public void start( ScheduledExecutorService executor )
{ {
} }

View File

@@ -25,6 +25,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.TreeSet; import java.util.TreeSet;
import java.util.concurrent.ScheduledExecutorService;
import message.Message; import message.Message;
import module.decode.DecoderType; import module.decode.DecoderType;
@@ -204,7 +205,7 @@ public class P25DecoderState extends DecoderState
} }
@Override @Override
public void start() public void start( ScheduledExecutorService executor )
{ {
} }

View File

@@ -25,6 +25,7 @@ import instrument.tap.stream.FloatTap;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.ScheduledExecutorService;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -229,7 +230,7 @@ public class P25_C4FMDecoder extends P25Decoder
} }
@Override @Override
public void start() public void start( ScheduledExecutorService executor )
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub

View File

@@ -26,6 +26,7 @@ import instrument.tap.stream.QPSKTap;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.ScheduledExecutorService;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -222,7 +223,7 @@ public class P25_LSMDecoder extends P25Decoder implements IComplexBufferListener
} }
@Override @Override
public void start() public void start( ScheduledExecutorService executor )
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub

View File

@@ -1,5 +1,7 @@
package module.decode.p25.audio; package module.decode.p25.audio;
import java.util.concurrent.ScheduledExecutorService;
import jmbe.iface.AudioConversionLibrary; import jmbe.iface.AudioConversionLibrary;
import jmbe.iface.AudioConverter; import jmbe.iface.AudioConverter;
import message.IMessageListener; import message.IMessageListener;
@@ -78,7 +80,7 @@ public class P25AudioModule extends Module implements Listener<Message>,
} }
@Override @Override
public void start() public void start( ScheduledExecutorService executor )
{ {
} }

View File

@@ -23,6 +23,7 @@ import instrument.tap.TapGroup;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.ScheduledExecutorService;
import module.decode.Decoder; import module.decode.Decoder;
import module.decode.DecoderType; import module.decode.DecoderType;
@@ -109,7 +110,7 @@ public class PassportDecoder extends Decoder
} }
@Override @Override
public void start() public void start( ScheduledExecutorService executor )
{ {
} }

View File

@@ -23,6 +23,7 @@ import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.TreeSet; import java.util.TreeSet;
import java.util.concurrent.ScheduledExecutorService;
import message.Message; import message.Message;
import module.decode.DecoderType; import module.decode.DecoderType;
@@ -75,7 +76,7 @@ public class PassportDecoderState extends DecoderState
} }
@Override @Override
public void start() public void start( ScheduledExecutorService executor )
{ {
} }

View File

@@ -17,6 +17,8 @@
******************************************************************************/ ******************************************************************************/
package module.decode.state; package module.decode.state;
import java.util.concurrent.ScheduledExecutorService;
import message.Message; import message.Message;
import module.decode.DecoderType; import module.decode.DecoderType;
import module.decode.state.DecoderStateEvent.Event; import module.decode.state.DecoderStateEvent.Event;
@@ -90,7 +92,7 @@ public class AlwaysUnsquelchedDecoderState extends DecoderState
} }
@Override @Override
public void start() public void start( ScheduledExecutorService executor )
{ {
broadcast( new Metadata( MetadataType.TO, mChannelName, false ) ); broadcast( new Metadata( MetadataType.TO, mChannelName, false ) );
broadcast( new DecoderStateEvent( this, Event.ALWAYS_UNSQUELCH, State.IDLE ) ); broadcast( new DecoderStateEvent( this, Event.ALWAYS_UNSQUELCH, State.IDLE ) );

View File

@@ -18,6 +18,7 @@
package module.decode.state; package module.decode.state;
import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture; import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
@@ -74,7 +75,6 @@ public class ChannelState extends Module implements ICallEventProvider,
private AtomicBoolean mMonitoring = new AtomicBoolean(); private AtomicBoolean mMonitoring = new AtomicBoolean();
private ScheduledFuture<?> mStateMonitorFuture; private ScheduledFuture<?> mStateMonitorFuture;
private ThreadPoolManager mThreadPoolManager;
private ChannelType mChannelType; private ChannelType mChannelType;
private TrafficChannelStatusListener mTrafficChannelStatusListener; private TrafficChannelStatusListener mTrafficChannelStatusListener;
@@ -106,9 +106,8 @@ public class ChannelState extends Module implements ICallEventProvider,
* ended, while continuing to display the call details for the user * ended, while continuing to display the call details for the user
* TEARDOWN Indicates a traffic channel that will be torn down for reuse. * TEARDOWN Indicates a traffic channel that will be torn down for reuse.
*/ */
public ChannelState( ThreadPoolManager manager, ChannelType channelType ) public ChannelState( ChannelType channelType )
{ {
mThreadPoolManager = manager;
mChannelType = channelType; mChannelType = channelType;
} }
@@ -126,7 +125,7 @@ public class ChannelState extends Module implements ICallEventProvider,
} }
@Override @Override
public void start() public void start( ScheduledExecutorService executor )
{ {
//Start a monitoring task to check for FADE and END event timeouts //Start a monitoring task to check for FADE and END event timeouts
if( mMonitoring.compareAndSet( false, true ) ) if( mMonitoring.compareAndSet( false, true ) )
@@ -135,8 +134,8 @@ public class ChannelState extends Module implements ICallEventProvider,
{ {
try try
{ {
mStateMonitorFuture = mThreadPoolManager.scheduleFixedRate( mStateMonitorFuture = executor.scheduleAtFixedRate(
ThreadType.DECODER, mStateMonitor, 20, TimeUnit.MILLISECONDS ); mStateMonitor, 0, 20, TimeUnit.MILLISECONDS );
} }
catch( RejectedExecutionException ree ) catch( RejectedExecutionException ree )
{ {
@@ -157,7 +156,7 @@ public class ChannelState extends Module implements ICallEventProvider,
{ {
if( mStateMonitorFuture != null ) if( mStateMonitorFuture != null )
{ {
boolean success = mThreadPoolManager.cancel( mStateMonitorFuture ); boolean success = mStateMonitorFuture.cancel( true );
if( !success ) if( !success )
{ {
@@ -175,7 +174,6 @@ public class ChannelState extends Module implements ICallEventProvider,
mChangedAttributeListener = null; mChangedAttributeListener = null;
mDecoderStateListener = null; mDecoderStateListener = null;
mSquelchStateListener = null; mSquelchStateListener = null;
mThreadPoolManager = null;
mStateMonitor = null; mStateMonitor = null;
} }

View File

@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ScheduledExecutorService;
import module.Module; import module.Module;
import module.ProcessingChain; import module.ProcessingChain;
@@ -86,13 +87,21 @@ public class TrafficChannelManager extends Module
mSystem = system; mSystem = system;
mSite = site; mSite = site;
mAliasListName = aliasListName; mAliasListName = aliasListName;
// mTrafficChannelTimeout = trafficChannelTimeout;
mTrafficChannelPoolMaximumSize = trafficChannelPoolSize; mTrafficChannelPoolMaximumSize = trafficChannelPoolSize;
} }
@Override @Override
public void dispose() public void dispose()
{ {
for( Channel trafficChannel: mTrafficChannelPool )
{
mChannelModel.broadcast( new ChannelEvent( trafficChannel, Event.REQUEST_DISABLE ) );
}
mTrafficChannelPool.clear();
mTrafficChannelsInUse.clear();
mCallEventListener = null; mCallEventListener = null;
mDecodeConfiguration = null; mDecodeConfiguration = null;
mPreviousDoNotMonitorCallEvent = null; mPreviousDoNotMonitorCallEvent = null;
@@ -350,7 +359,7 @@ public class TrafficChannelManager extends Module
} }
@Override @Override
public void start() public void start( ScheduledExecutorService executor )
{ {
} }

View File

@@ -26,6 +26,7 @@ import instrument.tap.stream.FloatTap;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.ScheduledExecutorService;
import module.decode.Decoder; import module.decode.Decoder;
import module.decode.DecoderType; import module.decode.DecoderType;
@@ -198,7 +199,7 @@ public class Tait1200Decoder extends Decoder implements IFilteredRealBufferListe
} }
@Override @Override
public void start() public void start( ScheduledExecutorService executor )
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub

View File

@@ -21,6 +21,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.TreeSet; import java.util.TreeSet;
import java.util.concurrent.ScheduledExecutorService;
import org.jdesktop.swingx.mapviewer.GeoPosition; import org.jdesktop.swingx.mapviewer.GeoPosition;
@@ -60,7 +61,7 @@ public class Tait1200DecoderState extends DecoderState
} }
@Override @Override
public void start() public void start( ScheduledExecutorService executor )
{ {
} }

View File

@@ -17,6 +17,8 @@
******************************************************************************/ ******************************************************************************/
package module.demodulate.am; package module.demodulate.am;
import java.util.concurrent.ScheduledExecutorService;
import module.Module; import module.Module;
import sample.Listener; import sample.Listener;
import sample.complex.ComplexBuffer; import sample.complex.ComplexBuffer;
@@ -111,7 +113,7 @@ public class AMDemodulatorModule extends Module
} }
@Override @Override
public void start() public void start( ScheduledExecutorService executor )
{ {
} }

View File

@@ -17,6 +17,8 @@
******************************************************************************/ ******************************************************************************/
package module.demodulate.audio; package module.demodulate.audio;
import java.util.concurrent.ScheduledExecutorService;
import module.Module; import module.Module;
import org.slf4j.Logger; import org.slf4j.Logger;
@@ -84,7 +86,7 @@ public class DemodulatedAudioFilterModule extends Module
} }
@Override @Override
public void start() public void start( ScheduledExecutorService executor )
{ {
} }

View File

@@ -17,6 +17,8 @@
******************************************************************************/ ******************************************************************************/
package module.demodulate.fm; package module.demodulate.fm;
import java.util.concurrent.ScheduledExecutorService;
import module.Module; import module.Module;
import org.slf4j.Logger; import org.slf4j.Logger;
@@ -97,7 +99,7 @@ public class FMDemodulatorModule extends Module
} }
@Override @Override
public void start() public void start( ScheduledExecutorService executor )
{ {
} }

View File

@@ -58,6 +58,5 @@ public class CallEventLogger extends EventLogger implements ICallEventListener,
@Override @Override
public void reset() public void reset()
{ {
super.start();
} }
} }

View File

@@ -24,6 +24,7 @@ import java.io.IOException;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
import java.io.Writer; import java.io.Writer;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.concurrent.ScheduledExecutorService;
import module.Module; import module.Module;
@@ -67,7 +68,8 @@ public abstract class EventLogger extends Module
public abstract String getHeader(); public abstract String getHeader();
public void start() @Override
public void start( ScheduledExecutorService executor )
{ {
if( mLogFile == null ) if( mLogFile == null )
{ {

View File

@@ -58,7 +58,6 @@ public class MessageEventLogger extends EventLogger implements
@Override @Override
public void reset() public void reset()
{ {
super.start();
} }
@Override @Override

View File

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

View File

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

View File

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

View File

@@ -19,6 +19,7 @@ package source.mixer;
import java.util.Iterator; import java.util.Iterator;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import javax.sound.sampled.AudioFormat; import javax.sound.sampled.AudioFormat;
@@ -29,12 +30,12 @@ import javax.sound.sampled.TargetDataLine;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import dsp.gain.AutomaticGainControl;
import sample.Listener; import sample.Listener;
import sample.adapter.ISampleAdapter; import sample.adapter.ISampleAdapter;
import sample.real.RealBuffer; import sample.real.RealBuffer;
import source.RealSource; import source.RealSource;
import source.SourceException; import source.SourceException;
import dsp.gain.AutomaticGainControl;
public class RealMixerSource extends RealSource public class RealMixerSource extends RealSource
{ {
@@ -86,7 +87,7 @@ public class RealMixerSource extends RealSource
} }
@Override @Override
public void start() public void start( ScheduledExecutorService executor )
{ {
} }

View File

@@ -19,7 +19,6 @@ package source.tuner;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.Executors;
import java.util.concurrent.LinkedTransferQueue; import java.util.concurrent.LinkedTransferQueue;
import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
@@ -39,8 +38,6 @@ import source.SourceException;
import source.tuner.frequency.FrequencyChangeEvent; import source.tuner.frequency.FrequencyChangeEvent;
import source.tuner.frequency.FrequencyChangeEvent.Event; import source.tuner.frequency.FrequencyChangeEvent.Event;
import source.tuner.frequency.IFrequencyChangeProcessor; import source.tuner.frequency.IFrequencyChangeProcessor;
import controller.NamingThreadFactory;
import controller.ThreadPoolManager.ThreadType;
import dsp.filter.FilterFactory; import dsp.filter.FilterFactory;
import dsp.filter.Window.WindowType; import dsp.filter.Window.WindowType;
import dsp.filter.cic.ComplexPrimeCICDecimate; import dsp.filter.cic.ComplexPrimeCICDecimate;
@@ -63,7 +60,6 @@ public class TunerChannelSource extends ComplexSource
private ComplexPrimeCICDecimate mDecimationFilter; private ComplexPrimeCICDecimate mDecimationFilter;
private Listener<ComplexBuffer> mListener; private Listener<ComplexBuffer> mListener;
private IFrequencyChangeProcessor mFrequencyChangeProcessor; private IFrequencyChangeProcessor mFrequencyChangeProcessor;
private ScheduledExecutorService mScheduledExecutorService;
private ScheduledFuture<?> mTaskHandle; private ScheduledFuture<?> mTaskHandle;
private long mTunerFrequency = 0; private long mTunerFrequency = 0;
@@ -114,14 +110,7 @@ public class TunerChannelSource extends ComplexSource
} }
@Override public void start( ScheduledExecutorService executor )
public void reset()
{
}
@Override
public void start()
{ {
if( mExpended ) if( mExpended )
{ {
@@ -132,12 +121,9 @@ public class TunerChannelSource extends ComplexSource
if( mRunning.compareAndSet( false, true )) if( mRunning.compareAndSet( false, true ))
{ {
mScheduledExecutorService = Executors.newScheduledThreadPool( 1,
new NamingThreadFactory( "tuner channel source" ) );
/* Schedule the decimation task to run every 10 ms (100 iterations/second) */ /* Schedule the decimation task to run every 10 ms (100 iterations/second) */
mTaskHandle = mScheduledExecutorService.scheduleAtFixedRate( mTaskHandle = executor.scheduleAtFixedRate( mDecimationProcessor,
mDecimationProcessor, 0, 10, TimeUnit.MILLISECONDS ); 0, 10, TimeUnit.MILLISECONDS );
/* Finally, register to receive samples from the tuner */ /* Finally, register to receive samples from the tuner */
mTuner.addListener( (Listener<ComplexBuffer>)this ); mTuner.addListener( (Listener<ComplexBuffer>)this );
@@ -149,6 +135,10 @@ public class TunerChannelSource extends ComplexSource
} }
} }
@Override
public void reset()
{
}
@Override @Override
public void stop() public void stop()
@@ -158,15 +148,10 @@ public class TunerChannelSource extends ComplexSource
mTuner.releaseChannel( this ); mTuner.releaseChannel( this );
mDecimationProcessor.shutdown(); mDecimationProcessor.shutdown();
if( mScheduledExecutorService != null && mTaskHandle != null ) if( mTaskHandle != null )
{ {
if( mTaskHandle != null ) mTaskHandle.cancel( true );
{ mTaskHandle = null;
mTaskHandle.cancel( true );
mTaskHandle = null;
}
mScheduledExecutorService.shutdownNow();
} }
mBuffer.clear(); mBuffer.clear();
@@ -349,7 +334,7 @@ public class TunerChannelSource extends ComplexSource
{ {
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
mBuffer.drainTo( mSampleBuffers ); mBuffer.drainTo( mSampleBuffers, 8 );
for( Buffer buffer: mSampleBuffers ) for( Buffer buffer: mSampleBuffers )
{ {

View File

@@ -18,6 +18,8 @@ package source.tuner.frequency;
* along with this program. If not, see <http://www.gnu.org/licenses/> * along with this program. If not, see <http://www.gnu.org/licenses/>
******************************************************************************/ ******************************************************************************/
import java.util.concurrent.ScheduledExecutorService;
import module.Module; import module.Module;
import org.slf4j.Logger; import org.slf4j.Logger;
@@ -118,7 +120,7 @@ public class DCTrackingFrequencyControl extends Module
} }
@Override @Override
public void start() public void start( ScheduledExecutorService executor )
{ {
} }

View File

@@ -20,6 +20,7 @@ package source.wave;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.Arrays; import java.util.Arrays;
import java.util.concurrent.ScheduledExecutorService;
import javax.sound.sampled.AudioFormat; import javax.sound.sampled.AudioFormat;
import javax.sound.sampled.AudioInputStream; import javax.sound.sampled.AudioInputStream;
@@ -58,11 +59,11 @@ public class ComplexWaveSource extends ComplexSource implements IControllableFil
public void reset() public void reset()
{ {
stop(); stop();
start(); start( null );
} }
@Override @Override
public void start() public void start( ScheduledExecutorService executor )
{ {
try try
{ {

View File

@@ -20,6 +20,7 @@ package source.wave;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.Arrays; import java.util.Arrays;
import java.util.concurrent.ScheduledExecutorService;
import javax.sound.sampled.AudioFormat; import javax.sound.sampled.AudioFormat;
import javax.sound.sampled.AudioInputStream; import javax.sound.sampled.AudioInputStream;
@@ -60,12 +61,12 @@ public class RealWaveSource extends RealSource
public void reset() public void reset()
{ {
stop(); stop();
start(); start( null );
} }
@Override @Override
public void start() public void start( ScheduledExecutorService executor )
{ {
try try
{ {