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

track and log all packetIDs and acks, including number (but not type)

Browse source 
of unacked packets.
This commit is contained in:
Eric House 2013-01-27 21:29:36 -08:00
parent 302ac9d55c
commit d1621c8d4b
1 changed files with 30 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayService.java
View file

@ -33,6 +33,7 @@ import java.net.InetAddress;
import java.net.Socket; import java.net.Socket;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.LinkedBlockingQueue;
@ -55,6 +56,9 @@ public class RelayService extends XWService {
private static final String ROWID = "ROWID"; private static final String ROWID = "ROWID";
private static final String BINBUFFER = "BINBUFFER"; private static final String BINBUFFER = "BINBUFFER";
private static HashSet<Integer> s_packetsSent = new HashSet<Integer>();
private static int s_nextPacketID = 1;
private Thread m_fetchThread = null; private Thread m_fetchThread = null;
private Thread m_UDPReadThread = null; private Thread m_UDPReadThread = null;
private Thread m_UDPWriteThread = null; private Thread m_UDPWriteThread = null;
@ -378,6 +382,9 @@ public class RelayService extends XWService {
dis.read( msg ); dis.read( msg );
postData( RelayService.this, token, msg ); postData( RelayService.this, token, msg );
break; break;
case XWPDEV_ACK:
noteAck( dis.readInt() );
break;
default: default:
DbgUtils.logf( "RelayService: Unhandled cmd: %d", DbgUtils.logf( "RelayService: Unhandled cmd: %d",
header.m_cmd ); header.m_cmd );
@ -503,7 +510,7 @@ public class RelayService extends XWService {
{ {
DataOutputStream out = new DataOutputStream( bas ); DataOutputStream out = new DataOutputStream( bas );
out.writeByte( XWPDEV_PROTO_VERSION ); out.writeByte( XWPDEV_PROTO_VERSION );
out.writeInt( 0 ); // packetID out.writeInt( nextPacketID( cmd ) ); // packetID
out.writeByte( cmd.ordinal() ); out.writeByte( cmd.ordinal() );
return out; return out;
} }
@ -711,6 +718,28 @@ public class RelayService extends XWService {
} }
} }
private static int nextPacketID( XWRelayReg cmd )
{
int nextPacketID = 0;
synchronized( s_packetsSent ) {
if ( XWRelayReg.XWPDEV_ACK != cmd ) {
nextPacketID = s_nextPacketID++;
s_packetsSent.add( nextPacketID );
}
}
DbgUtils.logf( "nextPacketID(%s)=>%d", cmd.toString(), nextPacketID );
return nextPacketID;
}
private static void noteAck( int packetID )
{
synchronized( s_packetsSent ) {
s_packetsSent.remove( packetID );
DbgUtils.logf( "Got ack for %d; there are %d unacked packets",
packetID, s_packetsSent.size() );
}
}
private class PacketHeader { private class PacketHeader {
public int m_packetID; public int m_packetID;
public XWRelayReg m_cmd; public XWRelayReg m_cmd;