Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-15 20:48:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

kill thread when wait() fires InterruptedException

Browse source 
Rather than just dropping it and going back to a wait that will likely
last forever. I *think* wait() throwing that exception means the
thread's being killed, in which case the exception should be thrown up
to the containing loop that will then exit.
This commit is contained in:
Eric House 2018-12-11 06:57:59 -08:00
parent f2322d7e81
commit 4f8f14c83b
1 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
View file

@ -999,16 +999,11 @@ public class RelayService extends JobIntentService
} }
} }
private RelayService getService() private RelayService getService() throws InterruptedException
{ {
synchronized ( mServiceHolder ) { synchronized ( mServiceHolder ) {
while ( null == mServiceHolder[0] ) { while ( null == mServiceHolder[0] ) {
try { mServiceHolder.wait();
mServiceHolder.wait();
} catch (InterruptedException ie) {
Log.e( TAG, "wait() threw: %s", ie.getMessage() );
// Assert.assertFalse( BuildConfig.DEBUG );
}
} }
return mServiceHolder[0]; return mServiceHolder[0];
} }
@ -1018,25 +1013,30 @@ public class RelayService extends JobIntentService
{ {
m_UDPReadThread = new Thread( null, new Runnable() { m_UDPReadThread = new Thread( null, new Runnable() {
public void run() { public void run() {
try {
connectSocket(); // block until this is done
startWriteThread();
connectSocket(); // block until this is done Log.i( TAG, "read thread running" );
startWriteThread(); byte[] buf = new byte[1024];
for ( ; ; ) {
Log.i( TAG, "read thread running" ); DatagramPacket packet =
byte[] buf = new byte[1024]; new DatagramPacket( buf, buf.length );
for ( ; ; ) { try {
DatagramPacket packet = m_UDPSocket.receive( packet );
new DatagramPacket( buf, buf.length ); final RelayService service = getService();
try { service.resetExitTimer();
m_UDPSocket.receive( packet ); service.gotPacket( packet );
final RelayService service = getService(); } catch ( java.io.InterruptedIOException iioe ) {
service.resetExitTimer(); // DbgUtils.logf( "FYI: udp receive timeout" );
service.gotPacket( packet ); } catch( java.io.IOException ioe ) {
} catch ( java.io.InterruptedIOException iioe ) { break;
// DbgUtils.logf( "FYI: udp receive timeout" ); }
} catch( java.io.IOException ioe ) {
break;
} }
} catch ( InterruptedException ie ) {
Log.d( TAG, "exiting on interrupt: %s",
ie.getMessage() );
} }
Log.i( TAG, "read thread exiting" ); Log.i( TAG, "read thread exiting" );
} }
@ -1054,7 +1054,7 @@ public class RelayService extends JobIntentService
m_queue.add( packet ); m_queue.add( packet );
} }
private void connectSocket() private void connectSocket() throws InterruptedException
{ {
if ( null == m_UDPSocket ) { if ( null == m_UDPSocket ) {
int port; int port;
@ -1109,19 +1109,19 @@ public class RelayService extends JobIntentService
dataListUDP.add( outData ); dataListUDP.add( outData );
} }
} }
sendViaWeb( dataListWeb );
sendViaUDP( dataListUDP );
getService().resetExitTimer();
runUDPAckTimer();
ConnStatusHandler.showSuccessOut();
} catch ( InterruptedException ie ) { } catch ( InterruptedException ie ) {
Log.w( TAG, "write thread killed" ); Log.w( TAG, "write thread killed" );
break; break;
} }
sendViaWeb( dataListWeb );
sendViaUDP( dataListUDP );
getService().resetExitTimer();
runUDPAckTimer();
ConnStatusHandler.showSuccessOut();
} }
Log.i( TAG, "write thread killing read thread" ); Log.i( TAG, "write thread killing read thread" );
@ -1140,7 +1140,7 @@ public class RelayService extends JobIntentService
m_UDPWriteThread.start(); m_UDPWriteThread.start();
} }
private int sendViaWeb( List<PacketData> packets ) private int sendViaWeb( List<PacketData> packets ) throws InterruptedException
{ {
int sentLen = 0; int sentLen = 0;
if ( packets.size() > 0 ) { if ( packets.size() > 0 ) {
@ -1196,7 +1196,7 @@ public class RelayService extends JobIntentService
return sentLen; return sentLen;
} }
private int sendViaUDP( List<PacketData> packets ) private int sendViaUDP( List<PacketData> packets ) throws InterruptedException
{ {
int sentLen = 0; int sentLen = 0;