KNEMC/KLALB
1
2
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

重发数据包优先

Browse Source
This commit is contained in:
Administrator
2023-01-05 08:19:54 +08:00
parent 62b22410a3
commit ea97e3891f
11 changed files with 428 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/kne/cloud/network/klalb/Consts.java
+1 -2
View File
@@ -1,9 +1,8 @@
package org.kne.cloud.network.klalb;
public class Consts {
public static final int BLOCKSIZE=16384;
public static final int BLOCKSIZE=8192;
public static final long PINGTIMENS=1000000000L;
public static final double A = 0.125;
public static final int SO_TIMEOUT = 20000;
public static final long SN_KEEP = 60000000000L;
public static final int MAX_RESEND = 100;
src/org/kne/cloud/network/klalb/KLALBBlock.java
+2
View File
@@ -23,6 +23,8 @@ public class KLALBBlock implements Comparable<KLALBBlock>{
public transient volatile long sendtime;
public transient volatile int resend;
public long sendtimeForRTT;
public KLALBBlock() {
src/org/kne/cloud/network/klalb/KLALBClient.java
+1
View File
@@ -67,6 +67,7 @@ public class KLALBClient {
public void listenProxy() {
for (int i = 0; i < pet.size(); i++) {
ProxyElement pe=pet.get(i);
if(pe.getIpport().getPort()>0&&pe.getIpport().getPort()<65536)
try {
open(pe);
} catch (IOException e) {
src/org/kne/cloud/network/klalb/KLALBCore.java
+125 -32
View File
@@ -32,10 +32,15 @@ import java.util.concurrent.Executors;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Predicate;
import java.util.zip.DataFormatException;
import org.kne.cloud.network.mport.ThreadTool;
public class KLALBCore {
private volatile long RTT=1000000000;
private volatile long RTO=1000000000;
private volatile long DevRTT=0;
private volatile int cacheblocks;
private Map<Integer, LocalTCPConnection> localtcps = new ConcurrentHashMap<>();
@@ -104,7 +109,7 @@ public class KLALBCore {
pdb.pingtime=System.nanoTime();
tc.sendBlock(pdb);
}
if(!tc.getNDSendDeque().isEmpty()||!tc.getSendDeque().isEmpty())
if(!tc.getNDSendDeque().isEmpty()||!tc.getSendDeque().isEmpty()||!tc.getReSendDeque().isEmpty())
break;
synchronized (tc.getSendDeque()) {
tc.getSendDeque().wait(10);
@@ -112,19 +117,32 @@ public class KLALBCore {
}
KLALBBlock k0=tc.getNDSendDeque().poll();
if(k0!=null) {
tc.sendBlock(k0,tc.getNDSendDeque().isEmpty());
if(k0.cuid==0&&k0.number==0&&k0.command==1) {
k0.pingtime+=System.nanoTime()- k0.sendtime;
}
tc.sendBlock(k0);
}else {
KLALBBlock k1=tc.getReSendDeque().poll();
if(k1!=null) {
tc.sendBlock(k1);
}else {
KLALBBlock k=tc.getSendDeque().poll();
if(k!=null) {
//if(localtcps.containsKey(k.cuid)||k.cuid.equals(ZERO_UUID))
tc.sendBlock(k,tc.getSendDeque().isEmpty());
tc.sendBlock(k);
}
}
}
}
public void remoteReceive(RemoteTCPConnection tc) throws IOException {
KLALBBlock brc=null;
for(;;) {
brc=tc.receiveBlock();
try {
brc=tc.receiveBlock();
} catch (DataFormatException e) {
throw new StreamCorruptedException("ZIP error");
}
brc.sendtime=System.nanoTime();
if(brc.number!=0||brc.sn==0) {
break;
}
@@ -156,11 +174,26 @@ public class KLALBCore {
pdb.number=0;
pdb.command=1;
pdb.pingtime=brc.pingtime;
pdb.sendtime=brc.sendtime;
tc.getNDSendDeque().offer(pdb);
}else if(brc.command==1) {
long cur=System.nanoTime();
long delay=(cur-brc.pingtime)/2;
long delay=cur-brc.pingtime;
tc.setDelayAvg(delay);
synchronized (remotetcps) {
Collections.sort(remotetcps, new Comparator<RemoteTCPConnection>() {
@Override
public int compare(RemoteTCPConnection o1, RemoteTCPConnection o2) {
if(o1.getDelay()>o2.getDelay()) {
return 1;
}else if(o1.getDelay()<o2.getDelay()){
return -1;
}else {
return 0;
}
}
});
}
}
}
}else {
@@ -191,7 +224,7 @@ public class KLALBCore {
ack.cuid=brc.cuid;
ack.number=-brc.number;
ack.cacheused=ltcs.getSendDeque().size();
submitDataBlockNoDelay(ack);
submitAckBlockNoDelay(ack,3);
}
@@ -199,34 +232,60 @@ public class KLALBCore {
long nx=-brc.number;
LocalTCPConnection ltc=localtcps.get(brc.cuid);
if(ltc!=null) {
ltc.getOutputcache().removeIf((b) -> {
List<KLALBBlock> l=ltc.getOutputcache();
synchronized (l) {
for (Iterator<KLALBBlock> iterator = l.iterator(); iterator.hasNext();) {
KLALBBlock klalbBlock = (KLALBBlock) iterator.next();
if(klalbBlock.number==nx) {
iterator.remove();
long SampleRTT=System.nanoTime()-klalbBlock.sendtimeForRTT;
RTT=(RTT*19+SampleRTT)/20;
DevRTT = (3*DevRTT + Math.abs( SampleRTT - RTT))/4;
RTO=RTT+DevRTT;
//System.out.println(RTO/1000000);
}
}
}
/*ltc.getOutputcache().removeIf((b) -> {
return b.number == nx;
});
});*/
ltc.setPeerCacheUsed(brc.cacheused);
}
}
}
}
public void submitDataBlock(KLALBBlock kb) throws InterruptedException {
public void submitDataBlock(KLALBBlock ks) throws InterruptedException {
submitDataBlock(ks,1);
}
public void submitDataBlock(KLALBBlock kb,int i) throws InterruptedException {
int ni=Math.min(i, remotetcps.size());
while(true) {
synchronized (remotetcps) {
Collections.sort(remotetcps, new Comparator<RemoteTCPConnection>() {
@Override
public int compare(RemoteTCPConnection o1, RemoteTCPConnection o2) {
if(o1.getDelay()>o2.getDelay()) {
return 1;
}else if(o1.getDelay()<o2.getDelay()){
return -1;
}else {
return 0;
}
}
});
//System.out.println(remotetcps);
for (Iterator<RemoteTCPConnection> iterator = remotetcps.iterator(); iterator.hasNext();) {
RemoteTCPConnection remoteTCPConnection = (RemoteTCPConnection) iterator.next();
Queue<KLALBBlock> bdq=remoteTCPConnection.getSendDeque();
if(bdq.size()<1) {
bdq.add(kb);
synchronized (bdq) {
bdq.notifyAll();
}
ni--;
if(ni<=0)
return;
}
}
}
Thread.sleep(1);
}
}
public void submitReDataBlock(KLALBBlock kb) throws InterruptedException {
while(true) {
synchronized (remotetcps) {
for (Iterator<RemoteTCPConnection> iterator = remotetcps.iterator(); iterator.hasNext();) {
RemoteTCPConnection remoteTCPConnection = (RemoteTCPConnection) iterator.next();
Queue<KLALBBlock> bdq=remoteTCPConnection.getReSendDeque();
if(bdq.size()<1) {
bdq.add(kb);
synchronized (bdq) {
@@ -252,20 +311,54 @@ public class KLALBCore {
}
}
}
public void submitAckBlockNoDelay(KLALBBlock kb,int limit) {
synchronized (remotetcps) {
int coun=0;
for (Iterator<RemoteTCPConnection> iterator = remotetcps.iterator(); iterator.hasNext();) {
if(coun>=limit) {
return;
}
RemoteTCPConnection rmt = (RemoteTCPConnection) iterator.next();
Queue<KLALBBlock> sq = rmt.getNDSendDeque();
sq.offer(kb);
synchronized (sq) {
sq.notifyAll();
}
coun++;
}
}
}
public void putDataBlock(LocalTCPConnection tc, KLALBBlock ks) throws InterruptedException {
while (!tc.getOutputcache().isEmpty()&&(tc.getOutputcount()-tc.getOutputcache().get(0).number>cacheblocks)) {
while (true) {
boolean b;
synchronized (ks) {
b=!tc.getOutputcache().isEmpty()&&(tc.getOutputcount()-tc.getOutputcache().get(0).number>cacheblocks);
}
if(!b) {
break;
}
Thread.sleep(1);
}
ks.sendtime=System.nanoTime();
ks.sendtimeForRTT=ks.sendtime;
//System.out.println(tc.getOutputcache().size());
if(ks.data==null) {
submitDataBlock(ks);
}else {
if(ks.data.length<Consts.BLOCKSIZE/2) {
submitDataBlock(ks,2);
}else {
submitDataBlock(ks);
}
}
tc.getOutputcache().add(ks);
submitDataBlock(ks);
if(tc.getPeerCacheUsed()>cacheblocks) {
while(tc.getPeerCacheUsed()>cacheblocks) {
int peerCacheUsed = tc.getPeerCacheUsed();
if(peerCacheUsed>cacheblocks) {
while( tc.getPeerCacheUsed()>cacheblocks) {
Thread.sleep(1);
}
}else if(tc.getPeerCacheUsed()>cacheblocks/2){
Thread.sleep(tc.getPeerCacheUsed()-cacheblocks/2);
}else if(peerCacheUsed>cacheblocks/2){
Thread.sleep(peerCacheUsed-cacheblocks/2);
}
}
@@ -276,15 +369,15 @@ public class KLALBCore {
for (int i = 0; i < l.size(); i++) {
KLALBBlock block=l.get(i);
long timex = (System.nanoTime() - block.sendtime) / 1000000;
if (timex > 200*(1<<Math.min(8,block.resend))+1000*i) {
submitDataBlock(block);
if ((i==0&&timex>100)||timex > (RTO/1000000)*(1<<Math.min(8,block.resend))+2000*i) {
submitReDataBlock(block);
block.sendtime = System.nanoTime();
block.resend++;
if(block.resend>=Consts.MAX_RESEND) {
l.remove(i);
i--;
}
System.out.println("超时重传："+block);
System.out.println("超时重传："+block+" 位置："+i);
}
}
}
src/org/kne/cloud/network/klalb/RemoteTCPConnection.java
+37 -7
View File
@@ -10,6 +10,7 @@ import java.io.OutputStream;
import java.io.StreamCorruptedException;
import java.net.Socket;
import java.net.UnknownHostException;
import java.util.Arrays;
import java.util.Queue;
import java.util.Random;
import java.util.UUID;
@@ -18,8 +19,11 @@ import java.util.concurrent.BlockingDeque;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.LinkedBlockingDeque;
import java.util.zip.DataFormatException;
import java.util.zip.Deflater;
import java.util.zip.GZIPInputStream;
import java.util.zip.GZIPOutputStream;
import java.util.zip.Inflater;
import org.kne.cloud.network.mport.IPPort;
import org.kne.io.AddInputStream;
@@ -40,6 +44,8 @@ public class RemoteTCPConnection extends TCPConnection {
}
protected void initIOs() throws IOException {
connect.setTrafficClass(0x10);
connect.setTcpNoDelay(true);
OutputStream outm=null;
InputStream inm=null;
if(tunnel!=null) {
@@ -58,8 +64,8 @@ public class RemoteTCPConnection extends TCPConnection {
}
dout = new DataOutputStream(new BufferedOutputStream(outm,Consts.BLOCKSIZE*2+1) );
din = new DataInputStream(new BufferedInputStream(inm,Consts.BLOCKSIZE*2+1));
dout = new DataOutputStream(outm);
din = new DataInputStream(inm);
}
@Override
@@ -133,8 +139,17 @@ public class RemoteTCPConnection extends TCPConnection {
if (data.data == null) {
dout.writeShort(-1);
} else {
dout.writeShort(data.data.length);
dout.write(data.data);
Deflater def = new Deflater(Deflater.BEST_COMPRESSION, true);
def.setInput(data.data);
def.finish();
byte[] b = new byte[(int)(data.data.length * 1.1D) + 64];
int nsize = def.deflate(b);
def.end();
this.dout.writeShort(nsize);
this.dout.write(b, 0, nsize);
/*dout.writeShort(data.data.length);
dout.write(data.data);*/
//System.out.println(Arrays.toString(data.data));
}
} else if (data.number == 0) {
dout.write(data.command);
@@ -165,7 +180,7 @@ public class RemoteTCPConnection extends TCPConnection {
//System.out.println("SEND:" + data);
}
public KLALBBlock receiveBlock() throws IOException {
public KLALBBlock receiveBlock() throws IOException, DataFormatException {
KLALBBlock klb = new KLALBBlock();
klb.cuid = din.readInt();
klb.number = din.readLong();
@@ -176,7 +191,18 @@ public class RemoteTCPConnection extends TCPConnection {
} else {
byte[] d = new byte[size];
din.readFully(d);
klb.data = d;
Inflater in = new Inflater(true);
in.setInput(d);
byte[] b = new byte[8192];
int nsize = in.inflate(b);
in.end();
if (nsize == b.length) {
klb.data = b;
} else {
klb.data = Arrays.copyOf(b, nsize);
}
//System.out.println(Arrays.toString(d));
//klb.data = d;
}
} else if (klb.number == 0) {
klb.command = din.read();
@@ -222,7 +248,11 @@ public class RemoteTCPConnection extends TCPConnection {
public Queue<KLALBBlock> getNDSendDeque() {
return NDsendDeque;
}
private Queue<KLALBBlock> resendDeque = new ConcurrentLinkedQueue<>();
public Queue<KLALBBlock> getReSendDeque() {
return sendDeque;
}
private Queue<KLALBBlock> sendDeque = new ConcurrentLinkedQueue<>();
public Queue<KLALBBlock> getSendDeque() {
src/org/kne/cloud/network/klalb/Tunnel.java
+1 -1
View File
@@ -138,7 +138,7 @@ public class Tunnel{
try {
p = Runtime.getRuntime().exec("./frpc/frpc_windows_386.exe",null,f);
p = Runtime.getRuntime().exec("./frpc/frpc_windows_amd64.exe",null,f);
BufferedReader brd=new BufferedReader(new InputStreamReader( p.getInputStream()));