From 62209d0b3bc43b3eea646bbd2e5b1cb4305635cb Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Thu, 12 May 2011 14:08:37 +0200
Subject: [PATCH] Removing the use of currentTimeMillis for the restart logic,
 closing ticket #845

---
 .../src/main/scala/akka/actor/ActorRef.scala  | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/akka-actor/src/main/scala/akka/actor/ActorRef.scala b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
index e2c391e300..9e75a91c4b 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorRef.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
@@ -600,7 +600,7 @@ class LocalActorRef private[akka] (
   @volatile
   private var maxNrOfRetriesCount: Int = 0
   @volatile
-  private var restartsWithinTimeRangeTimestamp: Long = 0L
+  private var restartTimeWindowStartNanos: Long = 0L
   @volatile
   private var _mailbox: AnyRef = _
   @volatile
@@ -892,30 +892,32 @@ class LocalActorRef private[akka] (
   }
 
   private def requestRestartPermission(maxNrOfRetries: Option[Int], withinTimeRange: Option[Int]): Boolean = {
+
     val denied = if (maxNrOfRetries.isEmpty && withinTimeRange.isEmpty) {  //Immortal
       false
     } else if (withinTimeRange.isEmpty) { // restrict number of restarts
-      maxNrOfRetriesCount += 1 //Increment number of retries
-      maxNrOfRetriesCount > maxNrOfRetries.get
+      val retries = maxNrOfRetriesCount + 1
+      maxNrOfRetriesCount = retries //Increment number of retries
+      retries > maxNrOfRetries.get
     } else {  // cannot restart more than N within M timerange
-      maxNrOfRetriesCount += 1 //Increment number of retries
-      val windowStart = restartsWithinTimeRangeTimestamp
-      val now         = System.currentTimeMillis
-      val retries     = maxNrOfRetriesCount
+      val retries = maxNrOfRetriesCount + 1
+
+      val windowStart = restartTimeWindowStartNanos
+      val now         = System.nanoTime
       //We are within the time window if it isn't the first restart, or if the window hasn't closed
       val insideWindow   = if (windowStart == 0) false
-                          else (now - windowStart) <= withinTimeRange.get
-
-      //The actor is dead if it dies X times within the window of restart
-      val unrestartable = insideWindow && retries > maxNrOfRetries.getOrElse(1)
+                          else (now - windowStart) <= TimeUnit.MILLISECONDS.toNanos(withinTimeRange.get)
 
       if (windowStart == 0 || !insideWindow) //(Re-)set the start of the window
-        restartsWithinTimeRangeTimestamp = now
+        restartTimeWindowStartNanos = now
 
-      if (windowStart != 0 && !insideWindow) //Reset number of restarts if window has expired
-        maxNrOfRetriesCount = 1
+      //Reset number of restarts if window has expired, otherwise, increment it
+      maxNrOfRetriesCount = if (windowStart != 0 && !insideWindow) 1 else retries //Increment number of retries
 
-      unrestartable
+      val restartCountLimit = if (maxNrOfRetries.isDefined) maxNrOfRetries.get else 1
+
+      //The actor is dead if it dies X times within the window of restart
+      insideWindow && retries > restartCountLimit
     }
 
     denied == false //If we weren't denied, we have a go