From 7847675f6fa5c7c5d88236d70422512f2dbd1597 Mon Sep 17 00:00:00 2001
From: leventov <leventov@ya.ru>
Date: Sun, 3 Jan 2016 01:11:06 +0300
Subject: [PATCH] Synchronize ModificationIterator acquisition with
 globalMutableStateLock, add a bit set identifying already initialized
 modification bit sets, not to clear them twice in ModificationIterator
 constructor

---
 .../chronicle/map/ReplicatedChronicleMap.java | 20 +++++++++++++------
 .../map/ReplicatedGlobalMutableState.java     |  6 ++++++
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
index 0be4850e0..8144450ec 100644
--- a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
@@ -315,14 +315,18 @@ public class ReplicatedChronicleMap<K, V, R> extends VanillaChronicleMap<K, V, R
         if (modificationIterator != null)
             return modificationIterator;
 
-        //noinspection SynchronizeOnNonFinalField
-        synchronized (modificationIterators) {
+        globalMutableStateLock();
+        try {
             modificationIterator = modificationIterators.get(remoteIdentifier);
 
             if (modificationIterator != null)
                 return modificationIterator;
 
-            final ModificationIterator modIter = new ModificationIterator(remoteIdentifier);
+            boolean modificationIteratorInit =
+                    globalMutableState().getModificationIteratorInitAt(remoteIdentifier);
+            final ModificationIterator modIter =
+                    new ModificationIterator(remoteIdentifier, modificationIteratorInit);
+            globalMutableState().setModificationIteratorInitAt(remoteIdentifier, true);
             //noinspection unchecked
             assignedModificationIterators = Stream
                     .concat(Arrays.stream(assignedModificationIterators), Stream.of(modIter))
@@ -330,6 +334,8 @@ public class ReplicatedChronicleMap<K, V, R> extends VanillaChronicleMap<K, V, R
                     .toArray(ReplicatedChronicleMap.ModificationIterator[]::new);
             modificationIterators.set(remoteIdentifier, modIter);
             return modIter;
+        } finally {
+            globalMutableStateUnlock();
         }
     }
 
@@ -629,12 +635,14 @@ public class ReplicatedChronicleMap<K, V, R> extends VanillaChronicleMap<K, V, R
          */
         private long tierBitSetAddr;
 
-        public ModificationIterator(byte remoteIdentifier) {
+        public ModificationIterator(byte remoteIdentifier, boolean sharedMemoryInit) {
             this.remoteIdentifier = remoteIdentifier;
             segmentBitSetsAddr = bsAddress() + startOfModificationIterators +
                     remoteIdentifier * segmentModIterBitSetsForIdentifierOuterSize;
-            nativeAccess().zeroOut(null, segmentBitSetsAddr,
-                    segmentModIterBitSetsForIdentifierOuterSize);
+            if (!sharedMemoryInit) {
+                nativeAccess().zeroOut(null, segmentBitSetsAddr,
+                        segmentModIterBitSetsForIdentifierOuterSize);
+            }
             offsetToBitSetsWithinATierBulk =
                     remoteIdentifier * tierBulkModIterBitSetsForIdentifierOuterSize;
 
diff --git a/src/main/java/net/openhft/chronicle/map/ReplicatedGlobalMutableState.java b/src/main/java/net/openhft/chronicle/map/ReplicatedGlobalMutableState.java
index b86f76d11..5a3736f4f 100644
--- a/src/main/java/net/openhft/chronicle/map/ReplicatedGlobalMutableState.java
+++ b/src/main/java/net/openhft/chronicle/map/ReplicatedGlobalMutableState.java
@@ -17,6 +17,7 @@
 package net.openhft.chronicle.map;
 
 import net.openhft.chronicle.hash.VanillaGlobalMutableState;
+import net.openhft.chronicle.values.Array;
 import net.openhft.chronicle.values.Group;
 
 interface ReplicatedGlobalMutableState extends VanillaGlobalMutableState {
@@ -24,4 +25,9 @@ interface ReplicatedGlobalMutableState extends VanillaGlobalMutableState {
     @Group(5)
     int getCurrentCleanupSegmentIndex();
     void setCurrentCleanupSegmentIndex(int currentCleanupSegmentIndex);
+
+    @Group(6)
+    @Array(length = 128)
+    boolean getModificationIteratorInitAt(int index);
+    void setModificationIteratorInitAt(int index, boolean init);
 }