[freenet-cvs] r11008 - in trunk/freenet/src/freenet: clients/http io/comm node

[zot...@freenetproject.org]

Author: zothar
Date: 2006-11-19 15:37:53 +0000 (Sun, 19 Nov 2006)
New Revision: 11008

Modified:
   trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
   trunk/freenet/src/freenet/io/comm/UdpSocketManager.java
   trunk/freenet/src/freenet/node/Node.java
Log:
Added unclaimed FIFO size statistic.  Tweaked "Initializing Node" log message 
formatting and information.

Modified: trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java       
2006-11-19 13:07:48 UTC (rev 11007)
+++ trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java       
2006-11-19 15:37:53 UTC (rev 11008)
@@ -158,6 +158,7 @@
                                overviewList.addChild("li", 
"routingMissDistance:\u00a0" + fix1p4.format(routingMissDistance));
                                overviewList.addChild("li", 
"backedOffPercent:\u00a0" + fix3p1pct.format(backedOffPercent));
                                overviewList.addChild("li", 
"pInstantReject:\u00a0" + fix3p1pct.format(node.pRejectIncomingInstantly()));
+                               overviewList.addChild("li", 
"unclaimedFIFOSize:\u00a0" + node.getUnclaimedFIFOSize());
                                nextTableCell = overviewTableRow.addChild("td");
                        }


Modified: trunk/freenet/src/freenet/io/comm/UdpSocketManager.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/UdpSocketManager.java     2006-11-19 
13:07:48 UTC (rev 11007)
+++ trunk/freenet/src/freenet/io/comm/UdpSocketManager.java     2006-11-19 
15:37:53 UTC (rev 11008)
@@ -640,4 +640,11 @@
        return 1476-28; // GRE (1476) minus headers (20 IP 8 UDP)
        // Note that some auth packets can be over 1400 bytes.
     }
+
+       /**
+        * @return the number of received messages that are currently unclaimed
+        */
+       public synchronized int getUnclaimedFIFOSize() {
+               return _unclaimed.size();
+       }
 }

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2006-11-19 13:07:48 UTC (rev 
11007)
+++ trunk/freenet/src/freenet/node/Node.java    2006-11-19 15:37:53 UTC (rev 
11008)
@@ -703,7 +703,7 @@
         Node(FreenetFilePersistentConfig config, RandomSource random, 
LoggingConfigHandler lc, NodeStarter ns) throws NodeInitException {
                // Easy stuff
                logMINOR = Logger.shouldLog(Logger.MINOR, this);
-               String tmp = "Initializing Node using SVN 
r"+Version.cvsRevision+" ("+Version.buildNumber()+") and freenet-ext 
r"+NodeStarter.extRevisionNumber;
+               String tmp = "Initializing Node using freenet Build 
#"+Version.buildNumber()+" r"+Version.cvsRevision+" and freenet-ext Build 
#"+NodeStarter.extBuildNumber+" r"+NodeStarter.extRevisionNumber;
                Logger.normal(this, tmp);
                System.out.println(tmp);
                pInstantRejectIncoming = new TimeDecayingRunningAverage(0, 
60000, 0.0, 1.0);
@@ -1684,6 +1684,7 @@
                fs.put("routingMissDistance", 
Double.toString(routingMissDistance.currentValue()));
                fs.put("backedOffPercent", 
Double.toString(backedOffPercent.currentValue()));
                fs.put("pInstantReject", 
Double.toString(pRejectIncomingInstantly()));
+               fs.put("unclaimedFIFOSize", 
Integer.toString(usm.getUnclaimedFIFOSize()));

                /* gather connection statistics */
                PeerNodeStatus[] peerNodeStatuses = getPeerNodeStatuses();
@@ -3306,4 +3307,8 @@
        public Ticker getTicker() {
                return ps;
        }
+
+       public int getUnclaimedFIFOSize() {
+               return usm.getUnclaimedFIFOSize();
+       }
 }