Changeset a65edbef

Timestamp:

May 20, 2014 12:35:48 PM (7 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

06894f9f, d106f48

Parents:

7479aa2

Message:

SSU: Fix peer test deadlock (ticket #1286)

Files:

• history.txt (modified) (1 diff)
• router/java/src/net/i2p/router/RouterVersion.java (modified) (1 diff)
• router/java/src/net/i2p/router/transport/udp/UDPTransport.java (modified) (6 diffs)

history.txt

@@ +1 @@
+2014-05-20 zzz
+ * Fixes after code review
+ * SSU: Fix peer test deadlock (ticket #1286)
+
 2014-05-15 kytv
  * Translations, imported from Transifex:

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 = 21;
+    public final static long BUILD = 22;
 
     /** for example "-test" */

router/java/src/net/i2p/router/transport/udp/UDPTransport.java

@@ -18 +18 @@
 import java.util.TreeSet;
 import java.util.Vector;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -3128 +3129 @@
         private boolean _alive;
         /** when did we last test our reachability */
-        private long _lastTested;
+        private final AtomicLong _lastTested = new AtomicLong();
         private boolean _forceRun;
 
@@ -3137 +3138 @@
         public synchronized void timeReached() {
             if (shouldTest()) {
-                long sinceRun = _context.clock().now() - _lastTested;
+                long sinceRun = _context.clock().now() - _lastTested.get();
                 if ( (_forceRun && sinceRun >= MIN_TEST_FREQUENCY) || (sinceRun >= TEST_FREQUENCY) ) {
                     locked_runTest();
@@ -3154 +3155 @@
                     _log.info("Running periodic test with bob = " + bob);
                 _testManager.runTest(bob.getRemoteIPAddress(), bob.getRemotePort(), bob.getCurrentCipherKey(), bob.getCurrentMACKey());
-                _lastTested = _context.clock().now();
+                setLastTested();
                 _forceRun = false;
                 return;
@@ -3179 +3180 @@
          */
         public synchronized void forceRunImmediately() {
-            _lastTested = 0;
+            _lastTested.set(0);
             _forceRun = true;
             reschedule(5*1000);
@@ -3198 +3199 @@
          *  @since 0.9.13
          */
-        public synchronized void setLastTested() {
-            _lastTested = _context.clock().now();
+        public void setLastTested() {
+            // do not synchronize - deadlock with PeerTestManager
+            _lastTested.set(_context.clock().now());
         }