Changeset e734a558

Timestamp:

Sep 15, 2008 4:19:08 PM (13 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

fcfe439

Parents:

825af3e

Message:

• Router: Shutdown clients first
• Throttle:
  • Use 60s rather than 10m tunnel.participatingMessageCount stat
  • Fix a summary bar message
• Tunnel Dispatcher: Update tunnel.participatingMessageCount every 20s, rather than at tunnel expiration, to maintain a more current stat

Location:

router/java/src/net/i2p/router

Files:

• Router.java (modified) (2 diffs)
• RouterThrottleImpl.java (modified) (2 diffs)
• tunnel/HopConfig.java (modified) (3 diffs)
• tunnel/TunnelDispatcher.java (modified) (6 diffs)

router/java/src/net/i2p/router/Router.java

@@ -807 +807 @@
             _log.log(Log.CRIT, "Error running shutdown task", t);
         }
+        try { _context.clientManager().shutdown(); } catch (Throwable t) { _log.log(Log.CRIT, "Error shutting down the client manager", t); }
         try { _context.jobQueue().shutdown(); } catch (Throwable t) { _log.log(Log.CRIT, "Error shutting down the job queue", t); }
         //try { _context.adminManager().shutdown(); } catch (Throwable t) { _log.log(Log.CRIT, "Error shutting down the admin manager", t); }        
         try { _context.statPublisher().shutdown(); } catch (Throwable t) { _log.log(Log.CRIT, "Error shutting down the stats manager", t); }
-        try { _context.clientManager().shutdown(); } catch (Throwable t) { _log.log(Log.CRIT, "Error shutting down the client manager", t); }
         try { _context.tunnelManager().shutdown(); } catch (Throwable t) { _log.log(Log.CRIT, "Error shutting down the tunnel manager", t); }
         try { _context.tunnelDispatcher().shutdown(); } catch (Throwable t) { _log.log(Log.CRIT, "Error shutting down the tunnel dispatcher", t); }
@@ -1200 +1200 @@
         getContext().statManager().addRateData("bw.recvRate", (long)getContext().bandwidthLimiter().getReceiveBps(), 0);
         
+        getContext().tunnelDispatcher().updateParticipatingStats();
+
         getContext().statManager().coalesceStats();
 

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

@@ -140 +140 @@
                                       + " current=" + numTunnels + ")");
                         _context.statManager().addRateData("router.throttleTunnelProbTooFast", (long)(numTunnels-avg), 0);
-                        setTunnelStatus("Rejecting " + ((int) probAccept*100) + "% of tunnels: High number of requests");
+                        setTunnelStatus("Rejecting " + (100 - (int) probAccept*100) + "% of tunnels: High number of requests");
                         return TunnelHistory.TUNNEL_REJECT_PROBABALISTIC_REJECT;
                     }
@@ -212 +212 @@
         double messagesPerTunnel = DEFAULT_MESSAGES_PER_TUNNEL_ESTIMATE;
         if (rs != null) {
-            r = rs.getRate(10*60*1000);
+            r = rs.getRate(60*1000);
             if (r != null) {
                 long count = r.getLastEventCount() + r.getCurrentEventCount();

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

@@ -28 +28 @@
     private Map _options;
     private long _messagesProcessed;
+    private long _oldMessagesProcessed;
     
     /** IV length for {@link #getReplyIV} */
@@ -43 +44 @@
         _options = null;
         _messagesProcessed = 0;
+        _oldMessagesProcessed = 0;
     }
     
@@ -116 +118 @@
     public void incrementProcessedMessages() { _messagesProcessed++; }
     public long getProcessedMessagesCount() { return _messagesProcessed; }
+    public long getRecentMessagesCount() {
+        long rv = _messagesProcessed - _oldMessagesProcessed;
+        _oldMessagesProcessed = _messagesProcessed;
+        return rv;
+    }
     
     public String toString() {

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

@@ -201 +201 @@
             _participants.put(recvId, participant);
         }
-        int numParticipants = 0;
         synchronized (_participatingConfig) {
             _participatingConfig.put(recvId, cfg);
-            numParticipants = _participatingConfig.size();
         }
         _context.messageHistory().tunnelJoined("participant", cfg);
-        _context.statManager().addRateData("tunnel.participatingTunnels", numParticipants, 0);
         _context.statManager().addRateData("tunnel.joinParticipant", 1, 0);
         if (cfg.getExpiration() > _lastParticipatingExpiration)
@@ -225 +222 @@
             _outboundEndpoints.put(recvId, endpoint);
         }
-        int numParticipants = 0;
         synchronized (_participatingConfig) {
             _participatingConfig.put(recvId, cfg);
-            numParticipants = _participatingConfig.size();
         }
         _context.messageHistory().tunnelJoined("outboundEndpoint", cfg);
-        _context.statManager().addRateData("tunnel.participatingTunnels", numParticipants, 0);
         _context.statManager().addRateData("tunnel.joinOutboundEndpoint", 1, 0);
 
@@ -255 +249 @@
             _inboundGateways.put(recvId, gw);
         }
-        int numParticipants = 0;
         synchronized (_participatingConfig) {
             _participatingConfig.put(recvId, cfg);
-            numParticipants = _participatingConfig.size();
         }
         _context.messageHistory().tunnelJoined("inboundGateway", cfg);
-        _context.statManager().addRateData("tunnel.participatingTunnels", numParticipants, 0);
         _context.statManager().addRateData("tunnel.joinInboundGateway", 1, 0);
 
@@ -339 +330 @@
         
         boolean removed = false;
-        int numParticipants = 0;
         synchronized (_participatingConfig) {
             removed = (null != _participatingConfig.remove(recvId));
-            numParticipants = _participatingConfig.size();
         }
         if (!removed) {
@@ -349 +338 @@
         }
         
-        _context.statManager().addRateData("tunnel.participatingTunnels", numParticipants, 0);
-        _context.statManager().addRateData("tunnel.participatingMessageCount", cfg.getProcessedMessagesCount(), 10*60*1000);
-
         synchronized (_participants) {
             removed = (null != _participants.remove(recvId));
@@ -548 +534 @@
     }
 
+    /**
+     * Generate a current estimate of usage per-participating-tunnel lifetime.
+     * The stats code calls this every 20s.
+     * This is better than waiting until the tunnel expires to update the rate,
+     * as we want this to be current because it's an important part of
+     * the throttle code.
+     */
+    public void updateParticipatingStats() {
+        List participating = listParticipatingTunnels();
+        int size = participating.size();
+        long count = 0;
+        long tcount = 0;
+        long tooYoung = _context.clock().now() - 60*1000;
+        long tooOld = tooYoung - 9*60*1000;
+        for (int i = 0; i < size; i++) {
+            HopConfig cfg = (HopConfig)participating.get(i);
+            long c = cfg.getRecentMessagesCount();
+            long created = cfg.getCreation();
+            if (created > tooYoung || created < tooOld)
+                continue;
+            tcount++;
+            count += c;
+        }
+        // This is called every 20s from Router.java, with 11m tunnel lifetime, so *= 33
+        if (tcount > 0)
+            count = count * 33 / tcount;
+        _context.statManager().addRateData("tunnel.participatingMessageCount", count, 20*1000);
+        _context.statManager().addRateData("tunnel.participatingTunnels", size, 0);
+    }
 
     private static final int DROP_BASE_INTERVAL = 40 * 1000;