* updated stats:

- sendsPerFailure: how many partial sends we make when they all fail
- timeoutCongestionInbound: describes how much faster than our average speed we were receiving data when each partial send timed out (in Bps)
- timeoutCongestionMessage: our send processing time when each partial send timed out (in ms)
- timeoutCongestionTunnel: our tunnel test time when each partial send timed out (in ms)
- participatingMessagesProcessedActive: # of messages more than the (most recent) average that a tunnel we were participating in transmitted (for tunnels with more than the average)
* updated to use Writer for rendering the console, so we can do partial writes (and hopefully help debug some kooky threading bugs on kaffe)

apps/routerconsole/java/src/net/i2p/router/web/NetDbHelper.java

@@ -2,11 +2,14 @@ package net.i2p.router.web;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
 
 import net.i2p.router.RouterContext;
 
 public class NetDbHelper {
     private RouterContext _context;
+    private Writer _out;
     /**
      * Configure this bean to query a particular router context
      *
@@ -23,13 +26,21 @@ public class NetDbHelper {
     
     public NetDbHelper() {}
     
+    public void setWriter(Writer writer) { _out = writer; }
+    
     public String getNetDbSummary() {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream(32*1024);
         try {
-            _context.netDb().renderStatusHTML(baos);
+            if (_out != null) {
+                _context.netDb().renderStatusHTML(_out);
+                return "";
+            } else {
+                ByteArrayOutputStream baos = new ByteArrayOutputStream(32*1024);
+                _context.netDb().renderStatusHTML(new OutputStreamWriter(baos));
+                return new String(baos.toByteArray());
+            }
         } catch (IOException ioe) {
             ioe.printStackTrace();
+            return "";
         }
-        return new String(baos.toByteArray());
     }
 }

apps/routerconsole/java/src/net/i2p/router/web/OldConsoleHelper.java

@@ -2,6 +2,8 @@ package net.i2p.router.web;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
 import java.util.List;
 
 import net.i2p.router.RouterContext;
@@ -9,6 +11,7 @@ import net.i2p.router.admin.StatsGenerator;
 
 public class OldConsoleHelper {
     private RouterContext _context;
+    private Writer _out;
     /**
      * Configure this bean to query a particular router context
      *
@@ -25,11 +28,20 @@ public class OldConsoleHelper {
     
     public OldConsoleHelper() {}
     
+    public void setWriter(Writer writer) { 
+        _out = writer; 
+    }
+    
     public String getConsole() {
         try {
-            ByteArrayOutputStream baos = new ByteArrayOutputStream(128*1024);
-            _context.router().renderStatusHTML(baos);
-            return baos.toString();
+            if (_out != null) {
+                _context.router().renderStatusHTML(_out);
+                return "";
+            } else {
+                ByteArrayOutputStream baos = new ByteArrayOutputStream(128*1024);
+                _context.router().renderStatusHTML(new OutputStreamWriter(baos));
+                return baos.toString();
+            }
         } catch (IOException ioe) {
             return "<b>Error rending the console</b>";
         }
@@ -38,9 +50,14 @@ public class OldConsoleHelper {
     public String getStats() {
         StatsGenerator gen = new StatsGenerator(_context);
         try {
-            ByteArrayOutputStream baos = new ByteArrayOutputStream(32*1024);
-            gen.generateStatsPage(baos);
-            return baos.toString();
+            if (_out != null) {
+                gen.generateStatsPage(_out);
+                return "";
+            } else {
+                ByteArrayOutputStream baos = new ByteArrayOutputStream(32*1024);
+                gen.generateStatsPage(new OutputStreamWriter(baos));
+                return baos.toString();
+            }
         } catch (IOException ioe) {
             return "<b>Error rending the console</b>";
         }

apps/routerconsole/java/src/net/i2p/router/web/ProfilesHelper.java

@@ -2,6 +2,7 @@ package net.i2p.router.web;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
 
 import net.i2p.router.RouterContext;
 
@@ -26,7 +27,7 @@ public class ProfilesHelper {
     public String getProfileSummary() {
         ByteArrayOutputStream baos = new ByteArrayOutputStream(16*1024);
         try {
-            _context.profileOrganizer().renderStatusHTML(baos);
+            _context.profileOrganizer().renderStatusHTML(new OutputStreamWriter(baos));
         } catch (IOException ioe) {
             ioe.printStackTrace();
         }
@@ -36,7 +37,7 @@ public class ProfilesHelper {
     public String getShitlistSummary() {
         ByteArrayOutputStream baos = new ByteArrayOutputStream(4*1024);
         try {
-            _context.shitlist().renderStatusHTML(baos);
+            _context.shitlist().renderStatusHTML(new OutputStreamWriter(baos));
         } catch (IOException ioe) {
             ioe.printStackTrace();
         }

apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java

@@ -2,6 +2,7 @@ package net.i2p.router.web;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
 import java.text.DecimalFormat;
 
 import net.i2p.data.DataHelper;
@@ -334,7 +335,7 @@ public class SummaryHelper {
     public String getDestinations() {
         ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
         try {
-            _context.clientManager().renderStatusHTML(baos);
+            _context.clientManager().renderStatusHTML(new OutputStreamWriter(baos));
             return new String(baos.toByteArray());
         } catch (IOException ioe) {
             _context.logManager().getLog(SummaryHelper.class).error("Error rendering client info", ioe);
@@ -397,8 +398,7 @@ public class SummaryHelper {
         if (_context == null) 
             return "0ms";
         
-        Rate delayRate = _context.statManager().getRate("transport.sendProcessingTime").getRate(60*1000);
-        return ((int)delayRate.getAverageValue()) + "ms";
+        return _context.throttle().getMessageDelay() + "ms";
     }
     
     /**
@@ -410,7 +410,6 @@ public class SummaryHelper {
         if (_context == null) 
             return "0ms";
         
-        Rate lagRate = _context.statManager().getRate("tunnel.testSuccessTime").getRate(10*60*1000);
-        return ((int)lagRate.getAverageValue()) + "ms";
+        return _context.throttle().getTunnelLag() + "ms";
     }
 }