From 9c127a5f815a727c68e10b023545bcbd2e6e0389 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 23 Jan 2015 20:10:44 +0100 Subject: [PATCH] use AtomicLongfieldUpdater in FollowerLogInformationImpl Instead of keeping two AtomicLong instances, we instantiate two shared updater classes and keep the values in volatile fields. This lowers the memory consumption. Change-Id: I9e6ce426500ee61b8c02d75cb0edd361e996a443 Signed-off-by: Robert Varga --- .../raft/FollowerLogInformationImpl.java | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/FollowerLogInformationImpl.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/FollowerLogInformationImpl.java index 91a5dddb98..7a690d3d18 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/FollowerLogInformationImpl.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/FollowerLogInformationImpl.java @@ -10,53 +10,54 @@ package org.opendaylight.controller.cluster.raft; import com.google.common.base.Stopwatch; import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.atomic.AtomicLongFieldUpdater; import scala.concurrent.duration.FiniteDuration; public class FollowerLogInformationImpl implements FollowerLogInformation { + private static final AtomicLongFieldUpdater NEXT_INDEX_UPDATER = AtomicLongFieldUpdater.newUpdater(FollowerLogInformationImpl.class, "nextIndex"); + private static final AtomicLongFieldUpdater MATCH_INDEX_UPDATER = AtomicLongFieldUpdater.newUpdater(FollowerLogInformationImpl.class, "matchIndex"); private final String id; - private final AtomicLong nextIndex; + private final Stopwatch stopwatch = new Stopwatch(); - private final AtomicLong matchIndex; + private final long followerTimeoutMillis; - private final Stopwatch stopwatch; + private volatile long nextIndex; - private final long followerTimeoutMillis; + private volatile long matchIndex; public FollowerLogInformationImpl(String id, long nextIndex, long matchIndex, FiniteDuration followerTimeoutDuration) { this.id = id; - this.nextIndex = new AtomicLong(nextIndex); - this.matchIndex = new AtomicLong(matchIndex); - this.stopwatch = new Stopwatch(); + this.nextIndex = nextIndex; + this.matchIndex = matchIndex; this.followerTimeoutMillis = followerTimeoutDuration.toMillis(); } @Override public long incrNextIndex(){ - return nextIndex.incrementAndGet(); + return NEXT_INDEX_UPDATER.incrementAndGet(this); } @Override public long decrNextIndex() { - return nextIndex.decrementAndGet(); + return NEXT_INDEX_UPDATER.decrementAndGet(this); } @Override public void setNextIndex(long nextIndex) { - this.nextIndex.set(nextIndex); + this.nextIndex = nextIndex; } @Override public long incrMatchIndex(){ - return matchIndex.incrementAndGet(); + return MATCH_INDEX_UPDATER.incrementAndGet(this); } @Override public void setMatchIndex(long matchIndex) { - this.matchIndex.set(matchIndex); + this.matchIndex = matchIndex; } @Override @@ -66,12 +67,12 @@ public class FollowerLogInformationImpl implements FollowerLogInformation { @Override public long getNextIndex() { - return nextIndex.get(); + return nextIndex; } @Override public long getMatchIndex() { - return matchIndex.get(); + return matchIndex; } @Override -- 2.36.6