2006-03-30 jrandom

    * Substantially reduced the lock contention in the message registry (a
      major hotspot that can choke most threads).  Also reworked the locking
      so we don't need per-message timer events
    * No need to have additional per-peer message clearing, as they are
      either unregistered individually or expired.
    * Include some of the more transient tunnel throttling

history.txt

-$Id: history.txt,v 1.439 2006/03/25 18:50:51 jrandom Exp $
+$Id: history.txt,v 1.440 2006/03/26 18:23:54 jrandom Exp $
+
+2006-03-30  jrandom
+    * Substantially reduced the lock contention in the message registry (a
+      major hotspot that can choke most threads).  Also reworked the locking
+      so we don't need per-message timer events
+    * No need to have additional per-peer message clearing, as they are
+      either unregistered individually or expired.
+    * Include some of the more transient tunnel throttling
 
 * 2006-03-26  0.6.1.13 released
 

router/java/src/net/i2p/router/RouterThrottleImpl.java

@@ -248,7 +248,7 @@ class RouterThrottleImpl implements RouterThrottle {
      */
     private boolean allowTunnel(double bytesAllocated, int numTunnels) {
         int maxKBps = Math.min(_context.bandwidthLimiter().getOutboundKBytesPerSecond(), _context.bandwidthLimiter().getInboundKBytesPerSecond());
-        int used1s = 0; //get1sRate(_context); // dont throttle on the 1s rate, its too volatile
+        int used1s = get1sRate(_context); // dont throttle on the 1s rate, its too volatile
         int used1m = get1mRate(_context);
         int used5m = 0; //get5mRate(_context); // don't throttle on the 5m rate, as that'd hide available bandwidth
         int used = Math.max(Math.max(used1s, used1m), used5m);

router/java/src/net/i2p/router/RouterVersion.java

@@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
  *
  */
 public class RouterVersion {
-    public final static String ID = "$Revision: 1.380 $ $Date: 2006/03/25 18:50:48 $";
+    public final static String ID = "$Revision: 1.381 $ $Date: 2006/03/26 18:23:52 $";
     public final static String VERSION = "0.6.1.13";
-    public final static long BUILD = 0;
+    public final static long BUILD = 1;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
         System.out.println("Router ID: " + RouterVersion.ID);

router/java/src/net/i2p/router/Shitlist.java

@@ -84,7 +84,7 @@ public class Shitlist {
         
         _context.netDb().fail(peer);
         //_context.tunnelManager().peerFailed(peer);
-        _context.messageRegistry().peerFailed(peer);
+        //_context.messageRegistry().peerFailed(peer);
         if (!wasAlready)
             _context.messageHistory().shitlist(peer, reason);
         return wasAlready;

router/java/src/net/i2p/router/transport/GetBidsJob.java

@@ -47,7 +47,7 @@ public class GetBidsJob extends JobImpl {
         if (context.shitlist().isShitlisted(to)) {
             if (log.shouldLog(Log.WARN))
                 log.warn("Attempt to send a message to a shitlisted peer - " + to);
-            context.messageRegistry().peerFailed(to);
+            //context.messageRegistry().peerFailed(to);
             fail(context, msg);
             return;
         }