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

[t...@freenetproject.org]

Author: toad
Date: 2008-03-13 23:20:14 +0000 (Thu, 13 Mar 2008)
New Revision: 18524

Modified:
   trunk/freenet/src/freenet/node/NodeStats.java
Log:
Show block transfer psuccess on stats page (doh forgot one)

Modified: trunk/freenet/src/freenet/node/NodeStats.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeStats.java       2008-03-13 23:13:11 UTC 
(rev 18523)
+++ trunk/freenet/src/freenet/node/NodeStats.java       2008-03-13 23:20:14 UTC 
(rev 18524)
@@ -124,6 +124,7 @@
        final TrivialRunningAverage sskFetchPSuccess;
        final TrivialRunningAverage localFetchPSuccess;
        final TrivialRunningAverage remoteFetchPSuccess;
+       final TrivialRunningAverage blockTransferPSuccess;

        File persistTarget; 
        File persistTemp;
@@ -297,6 +298,7 @@
                sskFetchPSuccess = new TrivialRunningAverage();
                localFetchPSuccess = new TrivialRunningAverage();
                remoteFetchPSuccess = new TrivialRunningAverage();
+               blockTransferPSuccess = new TrivialRunningAverage();

                requestOutputThrottle = 
                        new TokenBucket(Math.max(obwLimit*60, 32768*20), 
(int)((1000L*1000L*1000L) / (obwLimit)), 0);
@@ -1030,7 +1032,8 @@
                                chkFetchPSuccess,
                                sskFetchPSuccess,
                                localFetchPSuccess,
-                               remoteFetchPSuccess
+                               remoteFetchPSuccess,
+                               blockTransferPSuccess
                };
                final String[] names = new String[] {
                                // FIXME l10n, but atm this only shows up in 
advanced mode
@@ -1038,7 +1041,8 @@
                                "CHKs",
                                "SSKs",
                                "Local requests",
-                               "Remote requests"
+                               "Remote requests",
+                               "Block transfers"
                };
                HTMLNode row = list.addChild("tr");
                row.addChild("th", "Group"); 
@@ -1603,18 +1607,14 @@
                return ((double)getSentOverhead() * 1000.0) / ((double) uptime);
        }

-       private long totalReceives;
-       private long successfulReceives;
-       
        public synchronized void successfulBlockReceive() {
-               totalReceives++;
-               successfulReceives++;
-               if(logMINOR) Logger.minor(this, "Successful receives: 
"+successfulReceives+"/"+totalReceives+" = "+((double)successfulReceives) / 
((double)totalReceives));
+               blockTransferPSuccess.report(1.0);
+               if(logMINOR) Logger.minor(this, "Successful receives: 
"+blockTransferPSuccess.currentValue()+" 
count="+blockTransferPSuccess.countReports());
        }

        public synchronized void failedBlockReceive() {
-               totalReceives++;
-               if(logMINOR) Logger.minor(this, "Successful receives: 
"+successfulReceives+"/"+totalReceives+" = "+((double)successfulReceives) / 
((double)totalReceives));
+               blockTransferPSuccess.report(0.0);
+               if(logMINOR) Logger.minor(this, "Successful receives: 
"+blockTransferPSuccess.currentValue()+" 
count="+blockTransferPSuccess.countReports());
        }

 }