Merge pull request #1162 from kirkshoop/stableperiodic

fix to remove drift from schedulePeriodic
ReactiveX · May 6, 2014 · dded83c · dded83c
2 parents 3764051 + 67cae34
commit dded83c
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/rxjava-core/src/main/java/rx/Scheduler.java b/rxjava-core/src/main/java/rx/Scheduler.java
@@ -99,15 +99,16 @@ public abstract static class Worker implements Subscription {
          */
         public Subscription schedulePeriodically(final Action0 action, long initialDelay, long period, TimeUnit unit) {
             final long periodInNanos = unit.toNanos(period);
+            final long startInNanos = TimeUnit.MILLISECONDS.toNanos(now()) + unit.toNanos(initialDelay);
 
             final Action0 recursiveAction = new Action0() {
+                long count = 0;
                 @Override
                 public void call() {
                     if (!isUnsubscribed()) {
-                        long startedAt = now();
                         action.call();
-                        long timeTakenByActionInNanos = TimeUnit.MILLISECONDS.toNanos(now() - startedAt);
-                        schedule(this, periodInNanos - timeTakenByActionInNanos, TimeUnit.NANOSECONDS);
+                        long nextTick = startInNanos + (++count * periodInNanos);
+                        schedule(this, nextTick - TimeUnit.MILLISECONDS.toNanos(now()), TimeUnit.NANOSECONDS);
                     }
                 }
             };