Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-14 08:01:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

move thread inside so it can be started and stopped. And exit the

Browse source 
thread on failure to connect, allowing comms' timer to control when we
retry.  This fixes problem where would try multiple times/second to
connect when relay was down.  Now we try every 15 seconds (per comms,
which can as well back-off), and shortly after the relay comes back up
connect successfully.
This commit is contained in:
Andy2 2010-11-24 18:14:34 -08:00
parent 8623c569e7
commit b4fb57de9c
1 changed files with 115 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
xwords4/android/XWords4/src/org/eehouse/android/xw4/CommsTransport.java
View file

@ -42,7 +42,7 @@ import org.eehouse.android.xw4.jni.*;
import org.eehouse.android.xw4.jni.JNIThread.*;
import org.eehouse.android.xw4.jni.CurGameInfo.DeviceRole;
public class CommsTransport extends Thread implements TransportProcs {
public class CommsTransport implements TransportProcs {
public static final int DIALOG = 0;
public static final int DIALOG_RETRY = 1;
@ -69,9 +69,9 @@ public class CommsTransport extends Thread implements TransportProcs {
private Selector m_selector;
private SocketChannel m_socketChannel;
private int m_jniGamePtr;
private boolean m_running = false;
private CommsAddrRec m_addr;
private JNIThread m_jniThread;
private CommsThread m_thread;
private Handler m_handler;
private boolean m_done = false;
@ -95,25 +95,7 @@ public class CommsTransport extends Thread implements TransportProcs {
m_bytesIn = ByteBuffer.allocate( 2048 );
}
public void setReceiver( JNIThread jnit )
{
m_jniThread = jnit;
}
public void waitToStop()
{
m_done = true;
if ( null != m_selector ) {
m_selector.wakeup();
}
if ( m_running ) { // synchronized this? Or use Thread method
try {
join(100); // wait up to 1/10 second
} catch ( java.lang.InterruptedException ie ) {
Utils.logf( "got InterruptedException: " + ie.toString() );
}
}
}
public class CommsThread extends Thread {
@Override
public void run()
@ -135,6 +117,7 @@ public class CommsTransport extends Thread implements TransportProcs {
m_addr.ip_relay_hostName, m_addr.ip_relay_port,
uae.toString() );
}
m_thread = null;
}
private void loop()
@ -173,6 +156,7 @@ public class CommsTransport extends Thread implements TransportProcs {
m_jniThread.handle( JNICmd.CMD_TRANSFAIL );
closeSocket();
Utils.logf( "exiting: " + cce.toString() );
break; // don't try again
} catch ( java.io.IOException ioe ) {
closeSocket();
Utils.logf( "exiting: " + ioe.toString() );
@ -215,6 +199,29 @@ public class CommsTransport extends Thread implements TransportProcs {
}
} // loop
}
public void setReceiver( JNIThread jnit )
{
m_jniThread = jnit;
}
public void waitToStop()
{
m_done = true;
if ( null != m_selector ) {
m_selector.wakeup();
}
if ( null != m_thread ) { // synchronized this? Or use Thread method
try {
m_thread.join(100); // wait up to 1/10 second
} catch ( java.lang.InterruptedException ie ) {
Utils.logf( "got InterruptedException: " + ie.toString() );
}
m_thread = null;
}
}
private synchronized void putOut( final byte[] buf )
{
int len = buf.length;
@ -306,6 +313,7 @@ public class CommsTransport extends Thread implements TransportProcs {
// TransportProcs interface
public int transportSend( byte[] buf, final CommsAddrRec faddr )
{
Utils.logf( "CommsTransport::transportSend(nbytes=%d)", buf.length );
int nSent = -1;
if ( null == m_addr ) {
@ -320,9 +328,9 @@ public class CommsTransport extends Thread implements TransportProcs {
switch ( m_addr.conType ) {
case COMMS_CONN_RELAY:
putOut( buf ); // add to queue
if ( !m_running ) {
m_running = true;
start();
if ( null == m_thread ) {
m_thread = new CommsThread();
m_thread.start();
}
nSent = buf.length;
break;