From bc5d87e6f0de350546f03b79ace8e8545a6d7466 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Mon, 12 May 2008 13:53:11 +0000
Subject: [PATCH]     * i2psnark:       - Randomize the PeerCheckerTask start
 times to make global limiting         work better       - Calculate bw limits
 using 40s rather than 4m averages to make         bw limiting work better    
   - Change default bw limit from uplimit/3 to uplimit/2 due to        
 overhead reduction from the leaseset bundling change

---
 .../src/org/klomp/snark/PeerCoordinator.java  | 14 ++++++++++++-
 .../java/src/org/klomp/snark/Snark.java       |  3 ++-
 .../src/org/klomp/snark/SnarkManager.java     |  2 +-
 .../org/klomp/snark/web/I2PSnarkServlet.java  |  2 +-
 history.txt                                   | 21 +++++++++++++++++++
 news.xml                                      |  5 +----
 .../src/net/i2p/router/RouterVersion.java     |  2 +-
 7 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java b/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java
index ae74bfd607..8efd2332bc 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java
@@ -87,7 +87,10 @@ public class PeerCoordinator implements PeerListener
     setWantedPieces();
 
     // Install a timer to check the uploaders.
-    timer.schedule(new PeerCheckerTask(this), CHECK_PERIOD, CHECK_PERIOD);
+    // Randomize the first start time so multiple tasks are spread out,
+    // this will help the behavior with global limits
+    Random r = new Random();
+    timer.schedule(new PeerCheckerTask(this), (CHECK_PERIOD / 2) + r.nextInt((int) CHECK_PERIOD), CHECK_PERIOD);
   }
   
   // only called externally from Storage after the double-check fails
@@ -192,6 +195,15 @@ public class PeerCoordinator implements PeerListener
     return getRate(uploaded_old);
   }
 
+  public long getCurrentUploadRate()
+  {
+    // no need to synchronize, only one value
+    long r = uploaded_old[0];
+    if (r <= 0)
+        return 0;
+    return (r * 1000) / CHECK_PERIOD;
+  }
+
   private long getRate(long array[])
   {
     long rate = 0;
diff --git a/apps/i2psnark/java/src/org/klomp/snark/Snark.java b/apps/i2psnark/java/src/org/klomp/snark/Snark.java
index 07d2dbd875..f0fd66eaf0 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/Snark.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/Snark.java
@@ -785,9 +785,10 @@ public class Snark
     for (Iterator iter = coordinators.iterator(); iter.hasNext(); ) {
       PeerCoordinator c = (PeerCoordinator)iter.next();
       if (!c.halted())
-        total += c.getUploadRate();
+        total += c.getCurrentUploadRate();
     }
     long limit = 1024l * I2PSnarkUtil.instance().getMaxUpBW();
+    Snark.debug("Total up bw: " + total + " Limit: " + limit, Snark.WARNING);
     return total > limit;
   }
 }
diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
index 30b51aad74..5594052773 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
@@ -119,7 +119,7 @@ public class SnarkManager implements Snark.CompleteListener {
             _config.setProperty(PROP_UPLOADERS_TOTAL, "" + Snark.MAX_TOTAL_UPLOADERS);
         if (!_config.containsKey(PROP_UPBW_MAX)) {
             if (_context instanceof RouterContext)
-                _config.setProperty(PROP_UPBW_MAX, "" + (((RouterContext)_context).bandwidthLimiter().getOutboundKBytesPerSecond() / 3));
+                _config.setProperty(PROP_UPBW_MAX, "" + (((RouterContext)_context).bandwidthLimiter().getOutboundKBytesPerSecond() / 2));
             else
                 _config.setProperty(PROP_UPBW_MAX, "" + DEFAULT_MAX_UP_BW);
         }
diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
index 484edf0854..31592877fd 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -703,7 +703,7 @@ public class I2PSnarkServlet extends HttpServlet {
         out.write("Total uploader limit: <input type=\"text\" name=\"upLimit\" value=\""
                   + I2PSnarkUtil.instance().getMaxUploaders() + "\" size=\"3\" maxlength=\"3\" /> peers<br />\n");
         out.write("Up bandwidth limit: <input type=\"text\" name=\"upBW\" value=\""
-                  + I2PSnarkUtil.instance().getMaxUpBW() + "\" size=\"3\" maxlength=\"3\" /> KBps <i>(Router Up BW / 3 recommended)</i><br />\n");
+                  + I2PSnarkUtil.instance().getMaxUpBW() + "\" size=\"3\" maxlength=\"3\" /> KBps <i>(Router Up BW / 2 recommended)</i><br />\n");
         
         out.write("Use open trackers also: <input type=\"checkbox\" name=\"useOpenTrackers\" value=\"true\" " 
                   + (useOpenTrackers ? "checked " : "") 
diff --git a/history.txt b/history.txt
index 2a70a5ecfc..cc2a587652 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,24 @@
+2008-05-12 zzz
+    * Outbound message:
+      - Tweak the cache key for efficiency
+    * Stats:
+      - Require two udp stats when stats.full=false, caused NPE on peers.jsp
+    * Summary bar:
+      - Add messages when dropping tunnel requests due to load
+    * Update Handler:
+      - Add postman to the list
+    * i2psnark:
+      - Randomize the PeerCheckerTask start times to make global limiting
+        work better
+      - Calculate bw limits using 40s rather than 4m averages to make
+        bw limiting work better
+      - Change default bw limit from uplimit/3 to uplimit/2 due to
+        overhead reduction from the leaseset bundling change
+    * libjbigi:
+      - Add documentation on dynamic build option
+      - Add two speed tests to the build script
+      - Clean up the build script, make it easier to build dynamic
+
 2008-05-10 zzz
     * NetDb: Don't write the my.info file to disk, it isn't used for anything
     * Stats:
diff --git a/news.xml b/news.xml
index 94d7c26cbe..3e5e31ee4a 100644
--- a/news.xml
+++ b/news.xml
@@ -28,10 +28,7 @@ should improve the reliability of the whole network.
 
 <p>
 &#149;
-2008-02-05: <b>Upgrading from 0.6.1.30 and Earlier Releases</b>
-</p><p>
-Full instructions are posted at
-<a href="http://www.i2p2.i2p/upgrade-0.6.1.30.html">www.i2p2.i2p/upgrade-0.6.1.30.html</a>.
+2008-02-05: <b><a href="http://www.i2p2.i2p/upgrade-0.6.1.30.html">Upgrading from 0.6.1.30 and Earlier Releases</a></b>
 </p>
 
 <!--
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index bf1a1d0c44..045d01e8cc 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -17,7 +17,7 @@ import net.i2p.CoreVersion;
 public class RouterVersion {
     public final static String ID = "$Revision: 1.548 $ $Date: 2008-02-10 15:00:00 $";
     public final static String VERSION = "0.6.1.33";
-    public final static long BUILD = 4;
+    public final static long BUILD = 5;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
         System.out.println("Router ID: " + RouterVersion.ID);