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

mark packets with udp-sent time

Browse source 
Presence of timestamp instead of a boolean determines whether packet
should next via Web. Timestamps might also allow to process a larger
number of unacked packets in a single timer fire....
This commit is contained in:
Eric House 2017-12-18 18:21:33 -08:00
parent 2339f09557
commit 5772718537
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -619,7 +619,7 @@ public class RelayService extends XWService
private boolean skipNativeSend() private boolean skipNativeSend()
{ {
boolean skip = m_nativeFailScore > 10 || m_skipUPDSet; boolean skip = m_nativeFailScore > 10 || m_skipUPDSet;
// Log.d( TAG, "skipNativeSend() => %b", skip ); // Log.d( TAG, "skipNativeSend(score=%d)) => %b", m_nativeFailScore, skip );
return skip; return skip;
} }
@ -722,6 +722,8 @@ public class RelayService extends XWService
private int sendViaUDP( List<PacketData> packets ) private int sendViaUDP( List<PacketData> packets )
{ {
int sentLen = 0; int sentLen = 0;
long now = System.currentTimeMillis();
for ( PacketData packet : packets ) { for ( PacketData packet : packets ) {
boolean getOut = true; boolean getOut = true;
byte[] data = packet.assemble(); byte[] data = packet.assemble();
@ -731,6 +733,7 @@ public class RelayService extends XWService
sentLen += udpPacket.getLength(); sentLen += udpPacket.getLength();
noteSent( packet, s_packetsSentUDP ); noteSent( packet, s_packetsSentUDP );
packet.setSent( now );
getOut = false; getOut = false;
} catch ( java.net.SocketException se ) { } catch ( java.net.SocketException se ) {
Log.ex( TAG, se ); Log.ex( TAG, se );
@ -775,7 +778,6 @@ public class RelayService extends XWService
} else { } else {
++m_nativeFailScore; // FAILED: increment ++m_nativeFailScore; // FAILED: increment
resend = true; // if ANY fails, resend all resend = true; // if ANY fails, resend all
stillThere.setForWeb();
} }
} }
} }
@ -1366,7 +1368,7 @@ public class RelayService extends XWService
return nextPacketID; return nextPacketID;
} }
private static void noteAck( int packetID, boolean fromUDP ) private void noteAck( int packetID, boolean fromUDP )
{ {
PacketData packet; PacketData packet;
Map<Integer, PacketData> map = fromUDP ? s_packetsSentUDP : s_packetsSentWeb; Map<Integer, PacketData> map = fromUDP ? s_packetsSentUDP : s_packetsSentWeb;
@ -1591,7 +1593,7 @@ public class RelayService extends XWService
public byte[] m_header; public byte[] m_header;
public int m_packetID; public int m_packetID;
private long m_created; private long m_created;
private boolean m_useWeb; private long m_sentUDP;
public PacketData() { public PacketData() {
m_bas = null; m_bas = null;
@ -1612,8 +1614,8 @@ public class RelayService extends XWService
System.currentTimeMillis() - m_created ); System.currentTimeMillis() - m_created );
} }
void setForWeb() { m_useWeb = true; } void setSent( long ms ) { m_sentUDP = ms; }
boolean getForWeb() { return m_useWeb; } boolean getForWeb() { return m_sentUDP != 0; }
public boolean isEOQ() { return 0 == getLength(); } public boolean isEOQ() { return 0 == getLength(); }