Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 21:29:54 +01:00
Code Issues Projects Releases Wiki Activity

Use a SortedMap for efficient insertions.

Browse Source
This commit is contained in:
akwizgran
2012-01-24 14:40:45 +00:00
parent 3d4b5e6282
commit 899ec5e19e
1 changed files with 8 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
components/net/sf/briar/transport/IncomingReliabilityLayerImpl.java
View File

@@ -2,8 +2,8 @@ package net.sf.briar.transport;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.LinkedList; import java.util.SortedMap;
import java.util.ListIterator; import java.util.TreeMap;
/** A reliability layer that reorders out-of-order frames. */ /** A reliability layer that reorders out-of-order frames. */
class IncomingReliabilityLayerImpl implements IncomingReliabilityLayer { class IncomingReliabilityLayerImpl implements IncomingReliabilityLayer {
@@ -11,7 +11,7 @@ class IncomingReliabilityLayerImpl implements IncomingReliabilityLayer {
private final IncomingAuthenticationLayer in; private final IncomingAuthenticationLayer in;
private final int maxFrameLength; private final int maxFrameLength;
private final FrameWindow window; private final FrameWindow window;
private final LinkedList<Frame> frames; // Ordered by frame number private final SortedMap<Long, Frame> frames;
private final ArrayList<Frame> freeFrames; private final ArrayList<Frame> freeFrames;
private long nextFrameNumber = 0L; private long nextFrameNumber = 0L;
@@ -20,7 +20,7 @@ class IncomingReliabilityLayerImpl implements IncomingReliabilityLayer {
this.in = in; this.in = in;
maxFrameLength = in.getMaxFrameLength(); maxFrameLength = in.getMaxFrameLength();
window = new FrameWindowImpl(); window = new FrameWindowImpl();
frames = new LinkedList<Frame>(); frames = new TreeMap<Long, Frame>();
freeFrames = new ArrayList<Frame>(); freeFrames = new ArrayList<Frame>();
} }
@@ -28,8 +28,7 @@ class IncomingReliabilityLayerImpl implements IncomingReliabilityLayer {
InvalidDataException { InvalidDataException {
freeFrames.add(f); freeFrames.add(f);
// Read frames until there's an in-order frame to return // Read frames until there's an in-order frame to return
Frame next = frames.peek(); while(frames.isEmpty() || frames.firstKey() > nextFrameNumber) {
while(next == null || next.getFrameNumber() > nextFrameNumber) {
// Grab a free frame, or allocate one if necessary // Grab a free frame, or allocate one if necessary
int free = freeFrames.size(); int free = freeFrames.size();
if(free == 0) f = new Frame(maxFrameLength); if(free == 0) f = new Frame(maxFrameLength);
@@ -44,29 +43,12 @@ class IncomingReliabilityLayerImpl implements IncomingReliabilityLayer {
nextFrameNumber++; nextFrameNumber++;
return f; return f;
} }
// Insert the frame into the list // Insert the frame into the map
if(next == null || next.getFrameNumber() > frameNumber) { frames.put(frameNumber, f);
frames.push(f);
} else {
boolean inserted = false;
ListIterator<Frame> it = frames.listIterator();
while(it.hasNext()) {
if(it.next().getFrameNumber() > frameNumber) {
// Insert the frame before the one just examined
it.previous();
it.add(f);
inserted = true;
break;
}
}
if(!inserted) frames.add(f);
}
next = frames.peek();
} }
frames.poll();
if(!window.remove(nextFrameNumber)) throw new IllegalStateException(); if(!window.remove(nextFrameNumber)) throw new IllegalStateException();
nextFrameNumber++; nextFrameNumber++;
return next; return frames.remove(frames.firstKey());
} }
public int getMaxFrameLength() { public int getMaxFrameLength() {