[freenet-cvs] r18304 - trunk/freenet/src/freenet/node

[t...@freenetproject.org]

Author: toad
Date: 2008-03-01 21:32:31 +0000 (Sat, 01 Mar 2008)
New Revision: 18304

Modified:
   trunk/freenet/src/freenet/node/FNPPacketMangler.java
   trunk/freenet/src/freenet/node/KeyTracker.java
   trunk/freenet/src/freenet/node/PeerNode.java
Log:
PeerNode: Make pingAverage private.

Modified: trunk/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- trunk/freenet/src/freenet/node/FNPPacketMangler.java        2008-03-01 
21:17:08 UTC (rev 18303)
+++ trunk/freenet/src/freenet/node/FNPPacketMangler.java        2008-03-01 
21:32:31 UTC (rev 18304)
@@ -1926,7 +1926,7 @@

                if((seqNumber != -1) && tracker.alreadyReceived(seqNumber)) {
                        tracker.queueAck(seqNumber); // Must keep the 
connection open!
-                       if(logMINOR) Logger.minor(this, "Received packet twice 
("+seqNumber+") from "+tracker.pn.getPeer()+": "+seqNumber+" 
("+TimeUtil.formatTime((long) tracker.pn.pingAverage.currentValue(), 2, true)+" 
ping avg)");
+                       if(logMINOR) Logger.minor(this, "Received packet twice 
("+seqNumber+") from "+tracker.pn.getPeer()+": "+seqNumber+" 
("+TimeUtil.formatTime((long) tracker.pn.averagePingTime(), 2, true)+" ping 
avg)");
                        return;
                }


Modified: trunk/freenet/src/freenet/node/KeyTracker.java
===================================================================
--- trunk/freenet/src/freenet/node/KeyTracker.java      2008-03-01 21:17:08 UTC 
(rev 18303)
+++ trunk/freenet/src/freenet/node/KeyTracker.java      2008-03-01 21:32:31 UTC 
(rev 18304)
@@ -425,8 +425,8 @@
          */
                public void onAcked() {
                        long t = Math.max(0, System.currentTimeMillis() - 
createdTime);
-                       pn.pingAverage.report(t);
-                       if(logMINOR) Logger.minor(this, "Reported round-trip 
time of "+TimeUtil.formatTime(t, 2, true)+" on "+pn.getPeer()+" (avg 
"+TimeUtil.formatTime((long)pn.pingAverage.currentValue(),2,true)+", 
#"+packetNumber+ ')');
+                       pn.reportPing(t);
+                       if(logMINOR) Logger.minor(this, "Reported round-trip 
time of "+TimeUtil.formatTime(t, 2, true)+" on "+pn.getPeer()+" (avg 
"+TimeUtil.formatTime((long)pn.averagePingTime(),2,true)+", #"+packetNumber+ 
')');
                }

                long urgentDelay() {
@@ -646,7 +646,7 @@
         QueuedAckRequest qr = 
(QueuedAckRequest)ackRequestQueue.removeByKey(new Integer(seqNo));
        if(qr != null) qr.onAcked();
        else
-               Logger.normal(this, "Removing ack request twice? Null on 
"+seqNo+" from "+pn.getPeer()+" ("+TimeUtil.formatTime((int) 
pn.pingAverage.currentValue(), 2, true)+" ping avg)");
+               Logger.normal(this, "Removing ack request twice? Null on 
"+seqNo+" from "+pn.getPeer()+" ("+TimeUtil.formatTime((int) 
pn.averagePingTime(), 2, true)+" ping avg)");
     }

     /**

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2008-03-01 21:17:08 UTC 
(rev 18303)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2008-03-01 21:32:31 UTC 
(rev 18304)
@@ -2617,7 +2617,7 @@
        final static int MAX_PINGS = 5;
        final LRUHashtable pingsSentTimes = new LRUHashtable();
        long pingNumber;
-       final RunningAverage pingAverage;
+       private final RunningAverage pingAverage;

        /**
         * @return The probability of a request sent to this peer being 
rejected (locally)
@@ -3608,4 +3608,8 @@
                if(peer == null) return false; // presumably
                return !IPUtil.isValidAddress(peer.getAddress(), false);
        }
+
+       public void reportPing(long t) {
+               this.pingAverage.report(t);
+       }
 }