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.

src/module/decode/am/AMDecoder.java

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

src/module/decode/fleetsync2/Fleetsync2Decoder.java

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

src/module/decode/fleetsync2/Fleetsync2DecoderState.java

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

src/module/decode/lj1200/LJ1200Decoder.java

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

src/module/decode/lj1200/LJ1200DecoderState.java

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

src/module/decode/ltrnet/LTRNetDecoder.java

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

src/module/decode/ltrnet/LTRNetDecoderState.java

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

src/module/decode/ltrstandard/LTRStandardDecoder.java

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

src/module/decode/ltrstandard/LTRStandardDecoderState.java

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

src/module/decode/mdc1200/MDCDecoder.java

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

src/module/decode/mdc1200/MDCDecoderState.java

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

src/module/decode/mpt1327/MPT1327Decoder.java

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

src/module/decode/mpt1327/MPT1327DecoderState.java

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

src/module/decode/nbfm/NBFMDecoder.java

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

src/module/decode/p25/P25DecoderState.java

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

src/module/decode/p25/P25_C4FMDecoder.java

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

src/module/decode/p25/P25_LSMDecoder.java

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

src/module/decode/p25/audio/P25AudioModule.java

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

src/module/decode/passport/PassportDecoder.java

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

src/module/decode/passport/PassportDecoderState.java

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

src/module/decode/state/AlwaysUnsquelchedDecoderState.java

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

src/module/decode/state/ChannelState.java

@@ -18,6 +18,7 @@
 package module.decode.state;
 
 import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -74,7 +75,6 @@ public class ChannelState extends Module implements ICallEventProvider,
 	private AtomicBoolean mMonitoring = new AtomicBoolean();
 	private ScheduledFuture<?> mStateMonitorFuture;
 
-	private ThreadPoolManager mThreadPoolManager;
 	private ChannelType mChannelType;
 	
 	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
 	 *  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;
 	}
 	
@@ -126,7 +125,7 @@ public class ChannelState extends Module implements ICallEventProvider,
 	}
 
 	@Override
-	public void start()
+	public void start( ScheduledExecutorService executor )
 	{
 		//Start a monitoring task to check for FADE and END event timeouts
 		if( mMonitoring.compareAndSet( false, true ) )
@@ -135,8 +134,8 @@ public class ChannelState extends Module implements ICallEventProvider,
 			{
 				try
 				{
-					mStateMonitorFuture = mThreadPoolManager.scheduleFixedRate( 
-						ThreadType.DECODER, mStateMonitor, 20, TimeUnit.MILLISECONDS );
+					mStateMonitorFuture = executor.scheduleAtFixedRate(  
+						mStateMonitor, 0, 20, TimeUnit.MILLISECONDS );
 				}
 				catch( RejectedExecutionException ree )
 				{
@@ -157,7 +156,7 @@ public class ChannelState extends Module implements ICallEventProvider,
 		{
 			if( mStateMonitorFuture != null )
 			{
-				boolean success = mThreadPoolManager.cancel( mStateMonitorFuture );
+				boolean success = mStateMonitorFuture.cancel( true );
 				
 				if( !success )
 				{
@@ -175,7 +174,6 @@ public class ChannelState extends Module implements ICallEventProvider,
 		mChangedAttributeListener = null;
 		mDecoderStateListener = null;
 		mSquelchStateListener = null;
-		mThreadPoolManager = null;
 		mStateMonitor = null;
 	}
 	

src/module/decode/state/TrafficChannelManager.java

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

src/module/decode/tait/Tait1200Decoder.java

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

src/module/decode/tait/Tait1200DecoderState.java

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