[freenet-cvs] r18645 - trunk/freenet/src/freenet/io/xfer

[t...@freenetproject.org]

Author: toad
Date: 2008-03-20 16:54:25 +0000 (Thu, 20 Mar 2008)
New Revision: 18645

Modified:
   trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java
   trunk/freenet/src/freenet/io/xfer/BulkTransmitter.java
   trunk/freenet/src/freenet/io/xfer/PacketThrottle.java
Log:
Move the sentPayload() call from Block/BulkTransmitter into PacketThrottle.

Modified: trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java
===================================================================
--- trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java     2008-03-20 
16:47:43 UTC (rev 18644)
+++ trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java     2008-03-20 
16:54:25 UTC (rev 18645)
@@ -98,7 +98,6 @@
                                        int totalPackets;
                                        try {
                                                
_destination.sendThrottledMessage(DMT.createPacketTransmit(_uid, packetNo, 
_sentPackets, _prb.getPacket(packetNo)), _prb._packetSize, _ctr, SEND_TIMEOUT);
-                                               if(_ctr != null) 
_ctr.sentPayload(_prb._packetSize);
                                                
totalPackets=_prb.getNumPackets();
                                        } catch (NotConnectedException e) {
                                                Logger.normal(this, 
"Terminating send: "+e);

Modified: trunk/freenet/src/freenet/io/xfer/BulkTransmitter.java
===================================================================
--- trunk/freenet/src/freenet/io/xfer/BulkTransmitter.java      2008-03-20 
16:47:43 UTC (rev 18644)
+++ trunk/freenet/src/freenet/io/xfer/BulkTransmitter.java      2008-03-20 
16:54:25 UTC (rev 18645)
@@ -244,7 +244,6 @@
                        // Congestion control and bandwidth limiting
                        try {
                                
peer.sendThrottledMessage(DMT.createFNPBulkPacketSend(uid, blockNo, buf), 
prb.blockSize, ctr, BulkReceiver.TIMEOUT);
-                               if(ctr != null) ctr.sentPayload(prb.blockSize);
                                synchronized(this) {
                                        blocksNotSentButPresent.setBit(blockNo, 
false);
                                }

Modified: trunk/freenet/src/freenet/io/xfer/PacketThrottle.java
===================================================================
--- trunk/freenet/src/freenet/io/xfer/PacketThrottle.java       2008-03-20 
16:47:43 UTC (rev 18644)
+++ trunk/freenet/src/freenet/io/xfer/PacketThrottle.java       2008-03-20 
16:54:25 UTC (rev 18645)
@@ -221,6 +221,7 @@
                        } else if(logMINOR)
                                Logger.minor(this, "Not throttling 
"+peer.shortToString()+" for "+this);
                        peer.sendAsync(msg, callback, packetSize, ctr);
+                       if(ctr != null) ctr.sentPayload(packetSize);
                } catch (RuntimeException e) {
                        callback.fatalError();
                        throw e;