raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Switching to volatile int instead of AtomicInteger until ticket 384 is done

Browse source
This commit is contained in:
Viktor Klang 2010-10-11 19:15:14 +02:00
parent b42dfbc777
commit fdbfbe35d9
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
akka-actor/src/main/scala/actor/ActorRef.scala
View file

@ -644,7 +644,8 @@ class LocalActorRef private[akka] (
private[akka] lazy val _linkedActors = new ConcurrentHashMap[Uuid, ActorRef]
@volatile
private[akka] var _supervisor: Option[ActorRef] = None
private val maxNrOfRetriesCount = new AtomicInteger(0)
@volatile
private var maxNrOfRetriesCount: Int = 0
@volatile
private var restartsWithinTimeRangeTimestamp: Long = 0L
@volatile
@ -1041,11 +1042,13 @@ class LocalActorRef private[akka] (
false
}
else if (withinTimeRange.isEmpty) { // restrict number of restarts
maxNrOfRetriesCount.incrementAndGet > maxNrOfRetries.get
maxNrOfRetriesCount += 1 //Increment number of retries
maxNrOfRetriesCount > 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.incrementAndGet
val retries = maxNrOfRetriesCount
//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
@ -1059,7 +1062,7 @@ class LocalActorRef private[akka] (
restartsWithinTimeRangeTimestamp = now
if (windowStart != 0 && !insideWindow) //Reset number of restarts if window has expired
maxNrOfRetriesCount.set(1)
maxNrOfRetriesCount = 1
unrestartable
}