Changeset 021375b

Timestamp:

Dec 20, 2018 10:58:30 AM (2 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

18b7d97

Parents:

8a06027

Message:

NTCP: More now() calls out of loops

Files:

• apps/routerconsole/java/src/net/i2p/router/web/helpers/PeerHelper.java (modified) (3 diffs)
• router/java/src/net/i2p/router/transport/ntcp/EventPumper.java (modified) (2 diffs)
• router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java (modified) (2 diffs)
• router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java (modified) (4 diffs)

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

@@ -289 +289 @@
         out.write(buf.toString());
         buf.setLength(0);
+        long now = _context.clock().now();
         for (NTCPConnection con : peers) {
             buf.append("<tr><td class=\"cells\" align=\"left\" nowrap>");
@@ -307 +308 @@
             buf.append("</td><td class=\"cells peeripv6\" align=\"center\">").append(con.getVersion());
             buf.append("</td><td class=\"cells\" align=\"center\"><span class=\"right\">");
-            buf.append(DataHelper.formatDuration2(con.getTimeSinceReceive()));
-            buf.append("</span>").append(THINSP).append("<span class=\"left\">").append(DataHelper.formatDuration2(con.getTimeSinceSend()));
+            buf.append(DataHelper.formatDuration2(con.getTimeSinceReceive(now)));
+            buf.append("</span>").append(THINSP).append("<span class=\"left\">").append(DataHelper.formatDuration2(con.getTimeSinceSend(now)));
             buf.append("</span></td><td class=\"cells\" align=\"center\"><span class=\"right\">");
-            if (con.getTimeSinceReceive() < 2*60*1000) {
+            if (con.getTimeSinceReceive(now) < 2*60*1000) {
                 float r = con.getRecvRate();
                 buf.append(formatRate(r / 1000));
@@ -318 +319 @@
             }
             buf.append("</span>").append(THINSP).append("<span class=\"left\">");
-            if (con.getTimeSinceSend() < 2*60*1000) {
+            if (con.getTimeSinceSend(now) < 2*60*1000) {
                 float r = con.getSendRate();
                 buf.append(formatRate(r / 1000));

router/java/src/net/i2p/router/transport/ntcp/EventPumper.java

@@ -263 +263 @@
                                 if ((!key.isValid()) &&
                                     (!((SocketChannel)key.channel()).isConnectionPending()) &&
-                                    con.getTimeSinceCreated() > 2 * NTCPTransport.ESTABLISH_TIMEOUT) {
+                                    con.getTimeSinceCreated(now) > 2 * NTCPTransport.ESTABLISH_TIMEOUT) {
                                     if (_log.shouldLog(Log.INFO))
                                         _log.info("Removing invalid key for " + con);
@@ -294 +294 @@
                                 }
 
-                                if ( con.getTimeSinceSend() > expire &&
-                                     con.getTimeSinceReceive() > expire) {
+                                if ( con.getTimeSinceSend(now) > expire &&
+                                     con.getTimeSinceReceive(now) > expire) {
                                     // we haven't sent or received anything in a really long time, so lets just close 'er up
                                     con.sendTerminationAndClose();

router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java

@@ -417 +417 @@
     public long getTimeSinceSend() { return _context.clock().now()-_lastSendTime; }
     
+    /**
+     * @return milliseconds
+     * @since 0.9.38
+     */
     public long getTimeSinceSend(long now) { return now - _lastSendTime; }
 
@@ -422 +426 @@
     public long getTimeSinceReceive() { return _context.clock().now()-_lastReceiveTime; }
     
+    /**
+     * @return milliseconds
+     * @since 0.9.38
+     */
     public long getTimeSinceReceive(long now) { return now - _lastReceiveTime; }
 
     /** @return milliseconds */
     public long getTimeSinceCreated() { return _context.clock().now()-_created; }
+
+    /**
+     * @return milliseconds
+     * @since 0.9.38
+     */
+    public long getTimeSinceCreated(long now) { return now -_created; }
 
     /**

router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java

@@ -708 +708 @@
      */
     public int countActivePeers() {
-        final long now = _context.clock().now();
+        final long now = _context.clock().now();
         int active = 0;
         for (NTCPConnection con : _conByIdent.values()) {
@@ -725 +725 @@
      */
     public int countActiveSendPeers() {
+        final long now = _context.clock().now();
         int active = 0;
         for (NTCPConnection con : _conByIdent.values()) {
             // con initializes times at construction,
             // so check message count also
-            if (con.getMessagesSent() > 0 && con.getTimeSinceSend() <= 60*1000) {
+            if (con.getMessagesSent() > 0 && con.getTimeSinceSend(now) <= 60*1000) {
                 active++;
             }
@@ -1105 +1106 @@
     void expireTimedOut() {
         int expired = 0;
+        final long now = _context.clock().now();
 
             for (Iterator<NTCPConnection> iter = _establishing.iterator(); iter.hasNext(); ) {
@@ -1110 +1112 @@
                 if (con.isClosed() || con.isEstablished()) {
                     iter.remove();
-                } else if (con.getTimeSinceCreated() > ESTABLISH_TIMEOUT) {
+                } else if (con.getTimeSinceCreated(now) > ESTABLISH_TIMEOUT) {
                     iter.remove();
                     con.close();