Changeset acf5c31

Timestamp:

May 2, 2019 11:55:04 AM (2 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

8cdeff7

Parents:

20413f0

Message:

NTCP: Rare EventPumper? 100% CPU fix (ticket #2476)

Files:

• history.txt (modified) (1 diff)
• router/java/src/net/i2p/router/RouterVersion.java (modified) (1 diff)
• router/java/src/net/i2p/router/transport/ntcp/EventPumper.java (modified) (11 diffs)
• router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java (modified) (2 diffs)

history.txt

@@ +1 @@
+2019-05-02 zzz
+ * NTCP: Rare EventPumper 100% CPU fix (ticket #2476)
+
 2019-04-25 zzz
+ * Build: Drop unmaintained sample apparmor script (ticket #2319)
+ * i2ptunnel: Force connect delay and bulk profile for most
+   client tunnel types, and hide from UI
  * Transport: Disable NTCP 1 by default
 

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

@@ -19 +19 @@
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 8;
+    public final static long BUILD = 9;
 
     /** for example "-test" */
-    public final static String EXTRA = "";
+    public final static String EXTRA = "-rc";
     public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
     public static void main(String args[]) {

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

@@ -269 +269 @@
                                     // this will cancel the key, and it will then be removed from the keyset
                                     con.close();
+                                    key.cancel();
                                     failsafeInvalid++;
                                     continue;
@@ -299 +300 @@
                                     // we haven't sent or received anything in a really long time, so lets just close 'er up
                                     con.sendTerminationAndClose();
+                                    key.cancel();
                                     if (_log.shouldInfo())
                                         _log.info("Failsafe or expire close for " + con);
@@ -537 +539 @@
     
     private void processConnect(SelectionKey key) {
-        NTCPConnection con = (NTCPConnection)key.attachment();
+        final NTCPConnection con = (NTCPConnection)key.attachment();
+        final SocketChannel chan = con.getChannel();
         try {
-            SocketChannel chan = con.getChannel();
             boolean connected = chan.finishConnect();
             if (_log.shouldLog(Log.DEBUG))
@@ -588 +590 @@
      */
     private void processRead(SelectionKey key) {
-        NTCPConnection con = (NTCPConnection)key.attachment();
+        final NTCPConnection con = (NTCPConnection)key.attachment();
+        final SocketChannel chan = con.getChannel();
         ByteBuffer buf = null;
         try {
@@ -596 +599 @@
                 int readThisTime;
                 int readCount = 0;
-                while ((readThisTime = con.getChannel().read(buf)) > 0)  {
+                while ((readThisTime = chan.read(buf)) > 0)  {
                     read += readThisTime;
                     readCount++;
@@ -606 +609 @@
                 if (read < 0) {
                     if (con.isInbound() && con.getMessagesReceived() <= 0) {
-                        InetAddress addr = con.getChannel().socket().getInetAddress();
+                        InetAddress addr = chan.socket().getInetAddress();
                         int count;
                         if (addr != null) {
@@ -686 +689 @@
                 releaseBuf(buf);
             if (con.isInbound() && con.getMessagesReceived() <= 0) {
-                InetAddress addr = con.getChannel().socket().getInetAddress();
+                InetAddress addr = chan.socket().getInetAddress();
                 int count;
                 if (addr != null) {
@@ -732 +735 @@
      */
     private void processWrite(SelectionKey key) {
-        NTCPConnection con = (NTCPConnection)key.attachment();
+        final NTCPConnection con = (NTCPConnection)key.attachment();
+        final SocketChannel chan = con.getChannel();
         try {
             while (true) {
@@ -741 +745 @@
                         continue;                    
                     }
-                    int written = con.getChannel().write(buf);
+                    int written = chan.write(buf);
                     //totalWritten += written;
                     if (written == 0) {
@@ -846 +850 @@
         
         while ((con = _wantsConRegister.poll()) != null) {
+            final SocketChannel schan = con.getChannel();
             try {
-                SelectionKey key = con.getChannel().register(_selector, SelectionKey.OP_CONNECT);
+                SelectionKey key = schan.register(_selector, SelectionKey.OP_CONNECT);
                 key.attach(con);
                 con.setKey(key);
@@ -858 +863 @@
                         throw new IOException("Invalid NTCP address: " + naddr);
                     InetSocketAddress saddr = new InetSocketAddress(InetAddress.getByAddress(ip), port);
-                    boolean connected = con.getChannel().connect(saddr);
+                    boolean connected = schan.connect(saddr);
                     if (connected) {
                         // Never happens, we use nonblocking

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

@@ -289 +289 @@
      *  Valid for inbound; valid for outbound shortly after creation
      */
-    public SocketChannel getChannel() { return _chan; }
+    public synchronized SocketChannel getChannel() { return _chan; }
 
     /**
      *  Valid for inbound; valid for outbound shortly after creation
      */
-    public SelectionKey getKey() { return _conKey; }
-    public void setChannel(SocketChannel chan) { _chan = chan; }
-    public void setKey(SelectionKey key) { _conKey = key; }
+    public synchronized SelectionKey getKey() { return _conKey; }
+    public synchronized void setChannel(SocketChannel chan) { _chan = chan; }
+    public synchronized void setKey(SelectionKey key) { _conKey = key; }
 
     public boolean isInbound() { return _isInbound; }
@@ -1126 +1126 @@
      * as it occurs in the selector thread)
      */
-    void outboundConnected() {
+    synchronized void outboundConnected() {
+        if (_establishState == EstablishBase.FAILED) {
+            _conKey.cancel();
+            return;
+        }
         _conKey.interestOps(_conKey.interestOps() | SelectionKey.OP_READ);
         // schedule up the beginning of our handshaking by calling prepareNextWrite on the