limiter updates

- Handle IBGW max BW param (prop. 168)
- Set allocated BW in config for all tunnels for display
- Display allocated BW on /tunnels

more fixes to follow

apps/routerconsole/java/src/net/i2p/router/web/helpers/TunnelRenderer.java

@@ -112,7 +112,7 @@ class TunnelRenderer {
             DataHelper.sort(participating, new TunnelComparator());
             out.write("<table class=\"tunneldisplay tunnels_participating\"><tr><th>" + _t("Receive on") + "</th><th>" + _t("From") + "</th><th>"
                   + _t("Send on") + "</th><th>" + _t("To") + "</th><th>" + _t("Expiration") + "</th>"
-                  + "<th>" + _t("Usage") + "</th><th>" + _t("Rate") + "</th><th>" + _t("Role") + "</th></tr>\n");
+                  + "<th>" + _t("Usage") + "</th><th>" + _t("Rate") + "</th><th>" +  _t("Limit") + "</th><th>" + _t("Role") + "</th></tr>\n");
         }
         long processed = 0;
         RateStat rs = _context.statManager().getRate("tunnel.participatingMessageCount");
@@ -167,6 +167,7 @@ class TunnelRenderer {
                 lifetime = 10*60;
             long bps = 1024L * count / lifetime;
             out.write("<td class=\"cells\" align=\"center\">" + DataHelper.formatSize2Decimal(bps) + "Bps</td>");
+            out.write("<td class=\"cells\" align=\"center\">" + DataHelper.formatSize2Decimal(cfg.getAllocatedBW()) + "Bps</td>");
             if (to == null)
                 out.write("<td class=\"cells\" align=\"center\">" + _t("Outbound Endpoint") + "</td>");
             else if (from == null)

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

@@ -211,6 +211,14 @@ public class FIFOBandwidthLimiter {
         return _refiller.getCurrentParticipatingBandwidth();
     }
 
+    /**
+     *  In Bytes per second
+     *  @since 0.9.68
+     */
+    public int getMaxShareBandwidth() {
+        return _refiller.getMaxShareBandwidth();
+    }
+
     /**
      * Request some bytes. Does not block.
      */

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

@@ -351,6 +351,14 @@ public class FIFOBandwidthRefiller implements Runnable {
         return (int) (_partBWE.getBandwidthEstimate() * 1000f);
     }
 
+    /**
+     *  In Bytes per second
+     *  @since 0.9.68
+     */
+    int getMaxShareBandwidth() {
+        return _partBWE != null ? _partBWE.getMaxBandwidth() : DEFAULT_OUTBOUND_BANDWIDTH;
+    }
+
     /**
      *  Call a few times a minute to update the stats
      *

router/java/src/net/i2p/router/tunnel/OutboundMessageDistributor.java

@@ -15,6 +15,7 @@ import net.i2p.router.JobImpl;
 import net.i2p.router.OutNetMessage;
 import net.i2p.router.RouterContext;
 import net.i2p.util.Log;
+import net.i2p.util.SyntheticREDQueue;
 
 /**
  * When a message arrives at the outbound tunnel endpoint, this distributor
@@ -26,6 +27,7 @@ class OutboundMessageDistributor {
     private final Log _log;
     // following only for somebody else's OBEP, not for zero-hop
     private final Set<Hash> _toRouters;
+    private final SyntheticREDQueue _partBWE;
     private int _newRouterCount;
     private long _newRouterTime;
     
@@ -39,6 +41,16 @@ class OutboundMessageDistributor {
      *                  OutNetMessage.PRIORITY_MY_DATA for our own zero-hop OBGW/EP
      */
     public OutboundMessageDistributor(RouterContext ctx, int priority) {
+        this(ctx, priority, null);
+    }
+    
+    /**
+     *  @param priority OutNetMessage.PRIORITY_PARTICIPATING for somebody else's OBEP, or
+     *                  OutNetMessage.PRIORITY_MY_DATA for our own zero-hop OBGW/EP
+     *  @param bwe null for none
+     *  @since 0.9.68
+     */
+    public OutboundMessageDistributor(RouterContext ctx, int priority, SyntheticREDQueue bwe) {
         _context = ctx;
         _priority = priority;
         _log = ctx.logManager().getLog(OutboundMessageDistributor.class);
@@ -48,6 +60,7 @@ class OutboundMessageDistributor {
         } else {
             _toRouters = null;
         }
+        _partBWE = bwe;
         // all createRateStat() in TunnelDispatcher
     }
     
@@ -75,7 +88,7 @@ class OutboundMessageDistributor {
             if (_toRouters != null) {
                 // only if not zero-hop
                 // credit our lookup message as part. traffic
-                if (_context.tunnelDispatcher().shouldDropParticipatingMessage(TunnelDispatcher.Location.OBEP, DatabaseLookupMessage.MESSAGE_TYPE, 1024)) {
+                if (_context.tunnelDispatcher().shouldDropParticipatingMessage(TunnelDispatcher.Location.OBEP, DatabaseLookupMessage.MESSAGE_TYPE, 1024, _partBWE)) {
                     if (_log.shouldWarn())
                         _log.warn("Drop msg at OBEP (lookup bandwidth) to " + target.toBase64() + " type " + msg.getType());
                     return;

router/java/src/net/i2p/router/tunnel/OutboundTunnelEndpoint.java

@@ -11,6 +11,7 @@ import net.i2p.data.i2np.UnknownI2NPMessage;
 import net.i2p.router.OutNetMessage;
 import net.i2p.router.RouterContext;
 import net.i2p.util.Log;
+import net.i2p.util.SyntheticREDQueue;
 
 /**
  * We are the end of an outbound tunnel that we did not create.  Gather fragments
@@ -24,6 +25,7 @@ class OutboundTunnelEndpoint {
     private final HopProcessor _processor;
     private final FragmentHandler _handler;
     private final OutboundMessageDistributor _outDistributor;
+    private final SyntheticREDQueue _partBWE;
 
     public OutboundTunnelEndpoint(RouterContext ctx, HopConfig config, HopProcessor processor) {
         _context = ctx;
@@ -31,7 +33,13 @@ class OutboundTunnelEndpoint {
         _config = config;
         _processor = processor;
         _handler = new FragmentHandler(ctx, new DefragmentedHandler(), false);
-        _outDistributor = new OutboundMessageDistributor(ctx, OutNetMessage.PRIORITY_PARTICIPATING);
+        int max = _config.getAllocatedBW();
+        if (max <= TunnelParticipant.DEFAULT_BW_PER_TUNNEL_ESTIMATE) {
+            max = _context.tunnelDispatcher().getMaxPerTunnelBandwidth(TunnelDispatcher.Location.OBEP);
+            _config.setAllocatedBW(max);
+        }
+        _partBWE = new SyntheticREDQueue(_context, max);
+        _outDistributor = new OutboundMessageDistributor(ctx, OutNetMessage.PRIORITY_PARTICIPATING, _partBWE);
     }
 
     public void dispatch(TunnelDataMessage msg, Hash recvFrom) {
@@ -113,9 +121,10 @@ class OutboundTunnelEndpoint {
             int size = msg.getMessageSize();
             // don't drop it if we are the target
             boolean toUs = _context.routerHash().equals(toRouter);
-            if ((!toUs) &&
+            if (!toUs) {
-                _context.tunnelDispatcher().shouldDropParticipatingMessage(TunnelDispatcher.Location.OBEP, type, size))
+                if (_context.tunnelDispatcher().shouldDropParticipatingMessage(TunnelDispatcher.Location.OBEP, type, size, _partBWE))
-                return;
+                    return;
+            }
             // this overstates the stat somewhat, but ok for now
             //int kb = (size + 1023) / 1024;
             //for (int i = 0; i < kb; i++)

router/java/src/net/i2p/router/tunnel/ThrottledPumpedTunnelGateway.java

@@ -4,6 +4,7 @@ import net.i2p.data.Hash;
 import net.i2p.data.TunnelId;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.router.RouterContext;
+import net.i2p.util.SyntheticREDQueue;
 
 /**
  * Same as PTG, but check to see if a message should be dropped before queueing it.
@@ -14,11 +15,18 @@ import net.i2p.router.RouterContext;
 class ThrottledPumpedTunnelGateway extends PumpedTunnelGateway {
     /** saved so we can note messages that get dropped */
     private final HopConfig _config;
+    private final SyntheticREDQueue _partBWE;
     
     public ThrottledPumpedTunnelGateway(RouterContext context, QueuePreprocessor preprocessor, Sender sender,
                                         Receiver receiver, TunnelGatewayPumper pumper, HopConfig config) {
         super(context, preprocessor, sender, receiver, pumper);
         _config = config;
+        int max = _config.getAllocatedBW();
+        if (max <= TunnelParticipant.DEFAULT_BW_PER_TUNNEL_ESTIMATE) {
+            max = _context.tunnelDispatcher().getMaxPerTunnelBandwidth(TunnelDispatcher.Location.IBGW);
+            _config.setAllocatedBW(max);
+        }
+        _partBWE = new SyntheticREDQueue(_context, max);
     }
     
     /**
@@ -43,7 +51,7 @@ class ThrottledPumpedTunnelGateway extends PumpedTunnelGateway {
             // 2:1 batching of small messages
             size = 512;
         }
-        if (_context.tunnelDispatcher().shouldDropParticipatingMessage(TunnelDispatcher.Location.IBGW, msg.getType(), size)) {
+        if (_context.tunnelDispatcher().shouldDropParticipatingMessage(TunnelDispatcher.Location.IBGW, msg.getType(), size, _partBWE)) {
             // this overstates the stat somewhat, but ok for now
             int kb = (size + 1023) / 1024;
             for (int i = 0; i < kb; i++)

router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java

@@ -29,6 +29,7 @@ import net.i2p.router.Service;
 import net.i2p.router.peermanager.PeerProfile;
 import net.i2p.router.tunnel.pool.PooledTunnelCreatorConfig;
 import net.i2p.util.Log;
+import net.i2p.util.SyntheticREDQueue;
 
 /**
  * Handle the actual processing and forwarding of messages through the
@@ -789,8 +790,9 @@ public class TunnelDispatcher implements Service {
      * @param loc message hop location
      * @param type I2NP message type
      * @param length the length of the message
+     * @param bwe a per-tunnel bandwidth estimator to be checked first, or null
      */
-    public boolean shouldDropParticipatingMessage(Location loc, int type, int length) {
+    boolean shouldDropParticipatingMessage(Location loc, int type, int length, SyntheticREDQueue bwe) {
         if (length <= 0)
             return false;
 
@@ -817,6 +819,16 @@ public class TunnelDispatcher implements Service {
         } else {
             factor = 1.0f;
         }
+
+        if (bwe != null) {
+            if (!bwe.offer(length, factor)) {
+                if (_log.shouldWarn())
+                    _log.warn("Drop (per-tunnel) part. msg. factor=" + factor +
+                              ' ' + loc + ' ' + type + ' ' + length + ' ' + bwe);
+                return true;
+            }
+        }
+
         boolean reject = ! _context.bandwidthLimiter().sentParticipatingMessage(length, factor);
         if (reject) {
             if (_log.shouldLog(Log.WARN)) {
@@ -828,6 +840,26 @@ public class TunnelDispatcher implements Service {
         return reject;
     }
 
+    /**
+     * The maximum bandwidth for a single tunnel in Bps
+     *
+     * @param loc unused for now
+     * @since 0.9.68
+     */
+    int getMaxPerTunnelBandwidth(Location loc) {
+        int max = _context.bandwidthLimiter().getMaxShareBandwidth();
+        int maxTunnels = _context.getProperty(RouterThrottleImpl.PROP_MAX_TUNNELS, RouterThrottleImpl.DEFAULT_MAX_TUNNELS);
+        if (maxTunnels > 25) {
+            if (max >= 128*1024)      // O/P/X
+                max /= 16;
+            else if (max <= 48*1024)  // K/L
+                max /= 4;
+            else
+                max = (12*1024) + ((max - (48*1024)) / 8);  // M/N
+        }
+        return max;
+    }
+
     //private static final int DROP_BASE_INTERVAL = 40 * 1000;
     //private static final int DROP_RANDOM_BOOST = 10 * 1000;
 

router/java/src/net/i2p/router/tunnel/TunnelParticipant.java

@@ -8,7 +8,9 @@ import net.i2p.data.i2np.TunnelDataMessage;
 import net.i2p.router.JobImpl;
 import net.i2p.router.OutNetMessage;
 import net.i2p.router.RouterContext;
+import net.i2p.router.RouterThrottleImpl;
 import net.i2p.util.Log;
+import net.i2p.util.SyntheticREDQueue;
 
 /**
  * Participate in a tunnel at a location other than the gateway or outbound
@@ -25,12 +27,15 @@ class TunnelParticipant {
     private final InboundEndpointProcessor _inboundEndpointProcessor;
     private final InboundMessageDistributor _inboundDistributor;
     private final FragmentHandler _handler;
+    private final SyntheticREDQueue _partBWE;
     private RouterInfo _nextHopCache;
 
     private static final long MAX_LOOKUP_TIME = 15*1000;
     /** for next hop when a tunnel is first created */
     private static final long LONG_MAX_LOOKUP_TIME = 30*1000;
     private static final int PRIORITY = OutNetMessage.PRIORITY_PARTICIPATING;
+    /** @since 0.9.68 from BuildHandler */
+    static final int DEFAULT_BW_PER_TUNNEL_ESTIMATE = RouterThrottleImpl.DEFAULT_MESSAGES_PER_TUNNEL_ESTIMATE * 1024 / (10*60);
 
     /** not an inbound endpoint */
     public TunnelParticipant(RouterContext ctx, HopConfig config, HopProcessor processor) {
@@ -68,6 +73,16 @@ class TunnelParticipant {
             if (_nextHopCache == null)
                 _context.netDb().lookupRouterInfo(_config.getSendTo(), new Found(_context), null, LONG_MAX_LOOKUP_TIME);
         }
+        if (inEndProc == null) {
+            int max = _config.getAllocatedBW();
+            if (max <= DEFAULT_BW_PER_TUNNEL_ESTIMATE) {
+                max = _context.tunnelDispatcher().getMaxPerTunnelBandwidth(TunnelDispatcher.Location.PARTICIPANT);
+                _config.setAllocatedBW(max);
+            }
+            _partBWE = new SyntheticREDQueue(_context, max);
+        } else {
+            _partBWE = null;
+        }
         // all createRateStat() in TunnelDispatcher
     }
     
@@ -200,7 +215,7 @@ class TunnelParticipant {
 
     private void send(HopConfig config, TunnelDataMessage msg, RouterInfo ri) {
         if (_context.tunnelDispatcher().shouldDropParticipatingMessage(TunnelDispatcher.Location.PARTICIPANT,
-                                                                       TunnelDataMessage.MESSAGE_TYPE, 1024))
+                                                                       TunnelDataMessage.MESSAGE_TYPE, 1024, _partBWE))
             return;
         //_config.incrementSentMessages();
         long oldId = msg.getUniqueId();

router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java

@@ -928,6 +928,7 @@ class BuildHandler implements Runnable {
             if (props != null && !props.isEmpty()) {
                 int min = 0;
                 int rqu = 0;
+                int ibgwmax = 0;
                 String smin = props.getProperty(BuildRequestor.PROP_MIN_BW);
                 if (smin != null) {
                     try {
@@ -944,7 +945,17 @@ class BuildHandler implements Runnable {
                         response = TunnelHistory.TUNNEL_REJECT_BANDWIDTH;
                     }
                 }
-                if ((min > 0 || rqu > 0) && response == 0) {
+                if (isInGW) {
+                    String smax = props.getProperty(BuildRequestor.PROP_MAX_BW);
+                    if (smax != null) {
+                        try {
+                            ibgwmax = 1000 * Integer.parseInt(smax);
+                        } catch (NumberFormatException nfe) {
+                            response = TunnelHistory.TUNNEL_REJECT_BANDWIDTH;
+                        }
+                    }
+                }
+                if ((min > 0 || rqu > 0 || ibgwmax > 0) && response == 0) {
                     int share = 1000 * TunnelDispatcher.getShareBandwidth(_context);
                     int max = share / 20;
                     if (min > max) {
@@ -965,8 +976,10 @@ class BuildHandler implements Runnable {
                                         rqu = 4 * min;
                                     if (rqu > 0 && rqu < avail)
                                         avail = rqu;
+                                    if (ibgwmax > 0 && ibgwmax < avail)
+                                        avail = ibgwmax;
                                     if (_log.shouldWarn())
-                                        _log.warn("ACCEPT Part tunnel: min: " + min + " req: " + rqu + " avail: " + avail);
+                                        _log.warn("ACCEPT Part tunnel: min: " + min + " req: " + rqu + " max: " + ibgwmax + " avail: " + avail);
                                 }
                             }
                         }