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

Resolves issue with ChannelState FADE monitor - changes from

Browse Source 
starting/stopping the monitor for each call to simply leaving the
monitor task running continuously.  Was causing issue with scheduled
thread executor not shutting down the task in a timely manner -- new
approach should avoid start/stop related issues altogether.

Updates P25DecoderState with reordering of timing of when we send
updates for the TO/FROM identifiers so that the audio manager receives
up-to-date metadata and hopefully resolves issue with 'Do Not Monitor'
talkgroups being monitored by the audio manager.

Updates the AudioManager with a try/catch block around the processing
task so that we can catch any audio processing exceptions that occur
during the timer task and might get suppressed by the scheduled thread
executor.
This commit is contained in:
denny
2016-02-02 19:44:18 -05:00
parent debdc39a5f
commit ddfefe4b85
3 changed files with 176 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
src/module/decode/state/ChannelState.java
View File

@@ -82,7 +82,8 @@ public class ChannelState extends Module implements ICallEventProvider,
/**
* Channel state tracks the overall state of all processing modules and decoders
* configured for the channel and provides squelch control events.
* configured for the channel and provides squelch control and decoder state
* reset events.
*
* Uses a state enumeration that defines allowable channel state transitions in
* order to track a call or data decode event from start to finish. Uses a
@@ -127,19 +128,54 @@ public class ChannelState extends Module implements ICallEventProvider,
@Override
public void start()
{
//Start a monitoring task to check for FADE and END event timeouts
if( mMonitoring.compareAndSet( false, true ) )
{
if( mStateMonitorFuture == null && mStateMonitor != null )
{
try
{
mStateMonitorFuture = mThreadPoolManager.scheduleFixedRate(
ThreadType.DECODER, mStateMonitor, 20, TimeUnit.MILLISECONDS );
}
catch( RejectedExecutionException ree )
{
mLog.error( "state monitor scheduled task rejected", ree );
mMonitoring.set( false );
}
}
else
{
throw new RuntimeException( "Channel state monitor's scheduled "
+ "future pointer was not null" );
}
}
}
@Override
public void stop()
{
mSquelchLocked = false;
stopMonitor();
//Shutdown the state montoring task
if( mMonitoring.compareAndSet( true, false ) )
{
if( mStateMonitorFuture != null )
{
boolean success = mThreadPoolManager.cancel( mStateMonitorFuture );
if( !success )
{
mLog.error("Couldn't stop monitoring scheduled future" );
}
}
mStateMonitorFuture = null;
}
}
public void dispose()
{
stopMonitor();
mCallEventListener = null;
mChangedAttributeListener = null;
mDecoderStateListener = null;
@@ -193,57 +229,6 @@ public class ChannelState extends Module implements ICallEventProvider,
return mState;
}
/**
* Starts the state monitor running when we're not in IDLE state. Calls to
* start an already started monitor are ignored.
*/
private void startMonitor()
{
if( mMonitoring.compareAndSet( false, true ) )
{
if( mStateMonitorFuture == null && mStateMonitor != null )
{
try
{
mStateMonitorFuture = mThreadPoolManager.scheduleFixedRate(
ThreadType.DECODER, mStateMonitor, 20, TimeUnit.MILLISECONDS );
}
catch( RejectedExecutionException ree )
{
mLog.error( "state monitor scheduled task rejected", ree );
mMonitoring.set( false );
}
}
else
{
throw new RuntimeException( "Channel state monitor's scheduled "
+ "future pointer was not null" );
}
}
}
/**
* Stops the state monitor when we're in an IDLE state. Calls to stop an
* already stopped monitor are ignored.
*/
private void stopMonitor()
{
if( mMonitoring.compareAndSet( true, false ) )
{
if( mStateMonitorFuture != null )
{
boolean success = mThreadPoolManager.cancel( mStateMonitorFuture );
if( !success )
{
mLog.error("Couldn't stop monitoring scheduled future" );
}
}
mStateMonitorFuture = null;
}
}
/**
* Updates the fade timeout threshold to the current time plus delay
*/
@@ -332,7 +317,6 @@ public class ChannelState extends Module implements ICallEventProvider,
{
broadcast( SquelchState.SQUELCH );
updateFadeTimeout();
startMonitor();
mState = state;
broadcast( ChangedAttribute.CHANNEL_STATE );
}
@@ -341,14 +325,12 @@ public class ChannelState extends Module implements ICallEventProvider,
case ENCRYPTED:
broadcast( SquelchState.SQUELCH );
updateFadeTimeout();
startMonitor();
mState = state;
broadcast( ChangedAttribute.CHANNEL_STATE );
break;
case CALL:
broadcast( SquelchState.UNSQUELCH );
updateFadeTimeout();
startMonitor();
mState = state;
broadcast( ChangedAttribute.CHANNEL_STATE );
break;
@@ -368,10 +350,6 @@ public class ChannelState extends Module implements ICallEventProvider,
break;
}
}
else if( mState == State.ENCRYPTED && state == State.CALL )
{
updateFadeTimeout();
}
else
{
mLog.debug( "Can't change from [" + mState + "] to [" + state + "]" );
@@ -386,7 +364,6 @@ public class ChannelState extends Module implements ICallEventProvider,
{
updateResetTimeout();
mState = State.FADE;
startMonitor();
broadcast( SquelchState.SQUELCH );
broadcast( ChangedAttribute.CHANNEL_STATE );
@@ -402,7 +379,6 @@ public class ChannelState extends Module implements ICallEventProvider,
broadcast( new MetadataReset() );
}
stopMonitor();
mState = State.IDLE;
broadcast( ChangedAttribute.CHANNEL_STATE );
@@ -412,8 +388,6 @@ public class ChannelState extends Module implements ICallEventProvider,
{
broadcast( SquelchState.SQUELCH );
stopMonitor();
mState = State.TEARDOWN;
broadcast( ChangedAttribute.CHANNEL_STATE );