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

[t...@freenetproject.org]

Author: toad
Date: 2008-02-22 19:04:03 +0000 (Fri, 22 Feb 2008)
New Revision: 18103

Modified:
   trunk/freenet/src/freenet/node/RequestHandler.java
   trunk/freenet/src/freenet/node/RequestSender.java
Log:
Show which node we last routed to in node stats

Modified: trunk/freenet/src/freenet/node/RequestHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestHandler.java  2008-02-22 18:57:34 UTC 
(rev 18102)
+++ trunk/freenet/src/freenet/node/RequestHandler.java  2008-02-22 19:04:03 UTC 
(rev 18103)
@@ -219,7 +219,8 @@
                if (now > responseDeadline) {
                        // Offer the data if there is any.
                        node.failureTable.onFinalFailure(key, null, htl, -1, 
source);
-                       Logger.error(this, "requestsender took too long to 
respond to requestor ("+TimeUtil.formatTime((now - searchStartTime), 2, 
true)+"/"+rs.getStatusString()+")"); 
+                       PeerNode routedLast = rs.routedLast();
+                       Logger.error(this, "requestsender took too long to 
respond to requestor ("+TimeUtil.formatTime((now - searchStartTime), 2, 
true)+"/"+rs.getStatusString()+") routed to "+(routedLast == null ? "null" : 
routedLast.shortToString())); 
                        applyByteCounts();
                        unregisterRequestHandlerWithNode();
                        return;

Modified: trunk/freenet/src/freenet/node/RequestSender.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestSender.java   2008-02-22 18:57:34 UTC 
(rev 18102)
+++ trunk/freenet/src/freenet/node/RequestSender.java   2008-02-22 19:04:03 UTC 
(rev 18103)
@@ -97,6 +97,7 @@
     static final int GET_OFFER_VERIFY_FAILURE = 10;
     static final int GET_OFFER_TRANSFER_FAILED = 11;
     private PeerNode successFrom;
+    private PeerNode lastNode;

     static String getStatusString(int status) {
        switch(status) {
@@ -941,6 +942,7 @@
             notifyAll();
             if(status == SUCCESS)
                successFrom = next;
+            lastNode = next;
         }

         if(status == SUCCESS) {
@@ -1079,6 +1081,10 @@
        return successFrom;
     }

+    public PeerNode routedLast() {
+       return lastNode;
+    }
+    
        public byte[] getHeaders() {
         return headers;
     }