Changeset 1368548

Timestamp:

May 4, 2016 11:43:47 AM (5 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

cdafab27

Parents:

cb2790b

Message:

Utils: Fix bug in periodic timers triggered by
a backwards clock shift, caused graphs to be blank
and various router, streaming, and i2ptunnel
degradations over time (ticket #1776)
Log tweaks

Files:

• core/java/src/net/i2p/util/SimpleTimer2.java (modified) (9 diffs)
• history.txt (modified) (1 diff)
• router/java/src/net/i2p/router/RouterVersion.java (modified) (1 diff)

core/java/src/net/i2p/util/SimpleTimer2.java

@@ -254 +254 @@
 
         /** state of the current event.  All access should be under lock. */
-        private TimedEventState _state;
+        protected TimedEventState _state;
         /** absolute time this event should run next time. LOCKING: this */
         private long _nextRun;
@@ -339 +339 @@
         public synchronized void reschedule(long timeoutMs, boolean useEarliestTime) {
             if (timeoutMs <= 0) {
-                if (timeoutMs < 0 && _log.shouldWarn())
-                    _log.warn("Resched. timeout < 0: " + this + " timeout = " + timeoutMs + " state: " + _state);
+                if (timeoutMs < 0 && _log.shouldInfo())
+                    _log.info("Resched. timeout < 0: " + this + " timeout = " + timeoutMs + " state: " + _state);
                 timeoutMs = 1;
             }
@@ -424 +424 @@
             synchronized(this) {
                 if (Thread.currentThread().isInterrupted()) {
-                    _log.warn("I was interrupted in run, state "+_state+" event "+this);
+                    if (_log.shouldWarn())
+                        _log.warn("I was interrupted in run, state "+_state+" event "+this);
                     return;
                 }
@@ -432 +433 @@
                 switch(_state) {
                   case CANCELLED: 
+                      if (_log.shouldInfo())
+                          _log.info("Not actually running: CANCELLED " + this);
                     return; // goodbye
                   case IDLE:  // fall through
@@ -445 +448 @@
                     // proceed, switch to IDLE to reschedule
                     _state = TimedEventState.IDLE;
+                    if (_log.shouldInfo())
+                        _log.info("Early execution, Rescheduling for " + difference + " later: " + this);
                     schedule(difference); 
                     return;
@@ -486 +491 @@
                             if (_rescheduleAfterRun) {
                                 _rescheduleAfterRun = false;
+                                if (_log.shouldInfo())
+                                    _log.info("Reschedule after run: " + this);
                                 schedule(_nextRun - System.currentTimeMillis());
                             }
@@ -495 +502 @@
             if (time > 500 && _log.shouldLog(Log.WARN))
                 _log.warn(_pool + " event execution took " + time + ": " + this);
+            else if (_log.shouldDebug())
+                _log.debug("Execution finished in " + time + ": " + this);
             if (_log.shouldLog(Log.INFO)) {
                  // this call is slow - iterates through a HashMap -
@@ -538 +547 @@
      */
     private static abstract class PeriodicTimedEvent extends TimedEvent {
-        private long _timeoutMs;
+        private final long _timeoutMs;
         
         /**
@@ -557 +566 @@
         public void run() {
             super.run();
-            schedule(_timeoutMs);
+            synchronized(this) {
+                // Task may have rescheduled itself without actually running.
+                // If we schedule again, it will be stuck in a scheduling loop.
+                // This happens after a backwards clock shift.
+                if (_state == TimedEventState.IDLE)
+                    schedule(_timeoutMs);
+            }
         }
     }

history.txt

@@ +1 @@
+2016-05-04 zzz
+ * Utils: Fix bug in periodic timers triggered by
+   a backwards clock shift, caused graphs to be blank
+   and various router, streaming, and i2ptunnel
+   degradations over time (ticket #1776)
+
+2016-05-01 zzz
+ * Build: Compile resource bundles from ant, not msgfmt,
+   speeding up builds with translations by 20x
+ * Debian: Back out libhttpclient-java dependency,
+   requires 4.4 which is too recent for most distros
+
+2016-04-30 zzz
+ * Blocklist: Add RFC 6598 addresses
+ * Console:
+   - Only display cpuid information on x86
+   - Readme page link fixes (tickets #1789, #1790)
+ * Data: Fix NPE calculating the hash of a RI of unknown sig type
+ * Debian:
+   - Add runtime dependency on libhttpclient-java,
+     link to /usr/share/java/httpclient.jar and httpcore.jar
+ * Eepsite: comment out gzip filtering in cgi context,
+   causes hung threads, root cause unknown
+ * Router: Reduce log level of RI sig failure
+ * SAM: Log tweaks (ticket #1778)
+
 2016-04-29 zzz
  * Debian:

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" */