Author: j16sdiz
Date: 2008-10-24 23:24:16 +0000 (Fri, 24 Oct 2008)
New Revision: 23090
Modified:
trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java
trunk/freenet/src/freenet/io/xfer/PacketThrottle.java
trunk/freenet/src/freenet/io/xfer/PartiallyReceivedBlock.java
trunk/freenet/src/freenet/io/xfer/WaitedTooLongException.java
Log:
import and generic
Modified: trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java
===================================================================
--- trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java 2008-10-24
18:14:53 UTC (rev 23089)
+++ trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java 2008-10-24
23:24:16 UTC (rev 23090)
@@ -18,7 +18,6 @@
*/
package freenet.io.xfer;
-import java.util.Iterator;
import java.util.LinkedList;
import freenet.io.comm.ByteCounter;
@@ -54,7 +53,7 @@
private boolean _sendComplete;
final long _uid;
final PartiallyReceivedBlock _prb;
- private LinkedList _unsent;
+ private LinkedList<Integer> _unsent;
private Runnable _senderThread;
private BitArray _sentPackets;
final PacketThrottle throttle;
@@ -91,7 +90,7 @@
if(_sendComplete) return;
_senderThread.wait(10*1000);
}
- packetNo = ((Integer)
_unsent.removeFirst()).intValue();
+ packetNo =
_unsent.removeFirst();
}
} catch (InterruptedException e) {
Logger.error(this,
"_senderThread interrupted");
@@ -161,7 +160,7 @@
public void packetReceived(int
packetNo) {
synchronized(_senderThread) {
- _unsent.addLast(new
Integer(packetNo));
+
_unsent.addLast(packetNo);
timeAllSent = -1;
_sentPackets.setBit(packetNo, false);
_senderThread.notifyAll();
@@ -207,17 +206,16 @@
continue;
}
} else if
(msg.getSpec().equals(DMT.missingPacketNotification)) {
- LinkedList missing = (LinkedList)
msg.getObject(DMT.MISSING);
- for (Iterator i = missing.iterator();
i.hasNext();) {
- Integer packetNo = (Integer)
i.next();
- if
(_prb.isReceived(packetNo.intValue())) {
+ LinkedList<Integer> missing =
(LinkedList<Integer>) msg.getObject(DMT.MISSING);
+ for (int packetNo :missing) {
+ if (_prb.isReceived(packetNo)) {
synchronized(_senderThread) {
if
(_unsent.contains(packetNo)) {
Logger.minor(this, "already to transmit packet #"+packetNo);
} else {
_unsent.addFirst(packetNo);
timeAllSent=-1;
-
_sentPackets.setBit(packetNo.intValue(), false);
+
_sentPackets.setBit(packetNo, false);
_senderThread.notifyAll();
}
}
Modified: trunk/freenet/src/freenet/io/xfer/PacketThrottle.java
===================================================================
--- trunk/freenet/src/freenet/io/xfer/PacketThrottle.java 2008-10-24
18:14:53 UTC (rev 23089)
+++ trunk/freenet/src/freenet/io/xfer/PacketThrottle.java 2008-10-24
23:24:16 UTC (rev 23090)
@@ -24,9 +24,7 @@
import freenet.io.comm.NotConnectedException;
import freenet.io.comm.Peer;
import freenet.io.comm.PeerContext;
-import freenet.node.PeerNode;
import freenet.node.SyncSendWaitedTooLongException;
-import freenet.support.DoubleTokenBucket;
import freenet.support.Logger;
public class PacketThrottle {
Modified: trunk/freenet/src/freenet/io/xfer/PartiallyReceivedBlock.java
===================================================================
--- trunk/freenet/src/freenet/io/xfer/PartiallyReceivedBlock.java
2008-10-24 18:14:53 UTC (rev 23089)
+++ trunk/freenet/src/freenet/io/xfer/PartiallyReceivedBlock.java
2008-10-24 23:24:16 UTC (rev 23090)
@@ -18,7 +18,6 @@
*/
package freenet.io.xfer;
-import java.util.Iterator;
import java.util.LinkedList;
import freenet.support.Buffer;
@@ -38,7 +37,7 @@
boolean _aborted;
int _abortReason;
String _abortDescription;
- LinkedList _packetReceivedListeners = new LinkedList();
+ LinkedList<PacketReceivedListener> _packetReceivedListeners = new
LinkedList<PacketReceivedListener>();
public PartiallyReceivedBlock(int packets, int packetSize, byte[] data)
{
if (data.length != packets * packetSize) {
@@ -61,15 +60,15 @@
_packetSize = packetSize;
}
- public synchronized LinkedList addListener(PacketReceivedListener
listener) throws AbortedException {
+ public synchronized LinkedList<Integer>
addListener(PacketReceivedListener listener) throws AbortedException {
if (_aborted) {
throw new AbortedException("Adding listener to aborted
PRB");
}
_packetReceivedListeners.add(listener);
- LinkedList ret = new LinkedList();
+ LinkedList<Integer> ret = new LinkedList<Integer>();
for (int x = 0; x < _packets; x++) {
if (_received[x]) {
- ret.addLast(new Integer(x));
+ ret.addLast(x);
}
}
return ret;
@@ -115,7 +114,7 @@
_received[position] = true;
// FIXME keep it as as an array
- prls = (PacketReceivedListener[])
_packetReceivedListeners.toArray(new
PacketReceivedListener[_packetReceivedListeners.size()]);
+ prls = _packetReceivedListeners.toArray(new
PacketReceivedListener[_packetReceivedListeners.size()]);
}
@@ -160,8 +159,7 @@
_aborted = true;
_abortReason = reason;
_abortDescription = description;
- for (Iterator i = _packetReceivedListeners.iterator();
i.hasNext();) {
- PacketReceivedListener prl = (PacketReceivedListener)
i.next();
+ for (PacketReceivedListener prl : _packetReceivedListeners) {
prl.receiveAborted(reason, description);
}
}
Modified: trunk/freenet/src/freenet/io/xfer/WaitedTooLongException.java
===================================================================
--- trunk/freenet/src/freenet/io/xfer/WaitedTooLongException.java
2008-10-24 18:14:53 UTC (rev 23089)
+++ trunk/freenet/src/freenet/io/xfer/WaitedTooLongException.java
2008-10-24 23:24:16 UTC (rev 23090)
@@ -7,6 +7,7 @@
* Thrown when we wait too long to send a throttled packet.
* @author toad
*/
+ at SuppressWarnings("serial")
public class WaitedTooLongException extends Exception {
}
