http://git-wip-us.apache.org/repos/asf/geode/blob/d4f23332/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapIntKey.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapIntKey.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapIntKey.java
index 85b791e..0152f6d 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapIntKey.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapIntKey.java
@@ -15,74 +15,110 @@
 package org.apache.geode.internal.cache;
 
 // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
+
+
+
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
+
+
+
 import org.apache.geode.internal.cache.lru.EnableLRU;
+
+
 import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
+
 import org.apache.geode.internal.InternalStatisticsDisabledException;
+
 import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
 import org.apache.geode.internal.offheap.annotations.Released;
 import org.apache.geode.internal.offheap.annotations.Retained;
 import org.apache.geode.internal.offheap.annotations.Unretained;
+
 import 
org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
 
 // macros whose definition changes this class:
-// disk: DISK
+// disk: 1
 // lru: LRU
-// stats: STATS
+// stats: 1
 // versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
 // One of the following key macros must be defined:
 // key object: KEY_OBJECT
-// key int: KEY_INT
+// key int: 1
 // key long: KEY_LONG
 // key uuid: KEY_UUID
 // key string1: KEY_STRING1
 // key string2: KEY_STRING2
+
 /**
  * Do not modify this class. It was generated. Instead modify 
LeafRegionEntry.cpp and then run
  * ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top 
level directory).
  */
 public class VMStatsDiskRegionEntryOffHeapIntKey extends 
VMStatsDiskRegionEntryOffHeap {
-  public VMStatsDiskRegionEntryOffHeapIntKey(RegionEntryContext context, int 
key,
-      @Retained Object value) {
-    super(context, (value instanceof RecoveredEntry ? null : value));
+  public VMStatsDiskRegionEntryOffHeapIntKey  (RegionEntryContext context, int 
key, 
+
+      @Retained
+
+      Object value
+
+
+
+      ) {
+    super(context, 
+
+          (value instanceof RecoveredEntry ? null : value)
+
+
+
+        );
     // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
     initialize(context, value);
+
+
+
+
     this.key = key;
+
   }
 
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+  
   // common code
   protected int hash;
   private HashEntry<Object, Object> next;
   @SuppressWarnings("unused")
   private volatile long lastModified;
-  private static final 
AtomicLongFieldUpdater<VMStatsDiskRegionEntryOffHeapIntKey> lastModifiedUpdater 
=
-      
AtomicLongFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapIntKey.class, 
"lastModified");
+  private static final 
AtomicLongFieldUpdater<VMStatsDiskRegionEntryOffHeapIntKey> lastModifiedUpdater
+    = 
AtomicLongFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapIntKey.class, 
"lastModified");
+
   /**
    * All access done using ohAddrUpdater so it is used even though the 
compiler can not tell it is.
    */
   @SuppressWarnings("unused")
-  @Retained
-  @Released
-  private volatile long ohAddress;
+  @Retained @Released private volatile long ohAddress;
   /**
-   * I needed to add this because I wanted clear to call setValue which 
normally can only be called
-   * while the re is synced. But if I sync in that code it causes a lock 
ordering deadlock with the
-   * disk regions because they also get a rw lock in clear. Some hardware 
platforms do not support
-   * CAS on a long. If gemfire is run on one of those the 
AtomicLongFieldUpdater does a sync on the
-   * re and we will once again be deadlocked. I don't know if we support any 
of the hardware
-   * platforms that do not have a 64bit CAS. If we do then we can expect 
deadlocks on disk regions.
+   * I needed to add this because I wanted clear to call setValue which 
normally can only be called while the re is synced.
+   * But if I sync in that code it causes a lock ordering deadlock with the 
disk regions because they also get a rw lock in clear.
+   * Some hardware platforms do not support CAS on a long. If gemfire is run 
on one of those the AtomicLongFieldUpdater does a sync
+   * on the re and we will once again be deadlocked.
+   * I don't know if we support any of the hardware platforms that do not have 
a 64bit CAS. If we do then we can expect deadlocks
+   * on disk regions.
    */
-  private final static 
AtomicLongFieldUpdater<VMStatsDiskRegionEntryOffHeapIntKey> ohAddrUpdater =
-      
AtomicLongFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapIntKey.class, 
"ohAddress");
-
+  private final static 
AtomicLongFieldUpdater<VMStatsDiskRegionEntryOffHeapIntKey> ohAddrUpdater = 
AtomicLongFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapIntKey.class, 
"ohAddress");
+  
   @Override
   public Token getValueAsToken() {
     return OffHeapRegionEntryHelper.getValueAsToken(this);
   }
-
+  
   @Override
   protected Object getValueField() {
     return OffHeapRegionEntryHelper._getValue(this);
@@ -90,13 +126,18 @@ public class VMStatsDiskRegionEntryOffHeapIntKey extends 
VMStatsDiskRegionEntryO
 
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
   @Override
+
   @Unretained
   protected void setValueField(@Unretained Object v) {
+
+
+
     OffHeapRegionEntryHelper.setValue(this, v);
   }
-
   @Override
+
   @Retained
+
   public Object _getValueRetain(RegionEntryContext context, boolean 
decompress) {
     return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
   }
@@ -110,47 +151,44 @@ public class VMStatsDiskRegionEntryOffHeapIntKey extends 
VMStatsDiskRegionEntryO
   public boolean setAddress(long expectedAddr, long newAddr) {
     return ohAddrUpdater.compareAndSet(this, expectedAddr, newAddr);
   }
-
+  
   @Override
+
   @Released
+
   public void release() {
     OffHeapRegionEntryHelper.releaseEntry(this);
   }
-
+  
   @Override
   public void returnToPool() {
     // Deadcoded for now; never was working
-    // if (this instanceof VMThinRegionEntryLongKey) {
-    // factory.returnToPool((VMThinRegionEntryLongKey)this);
-    // }
+//    if (this instanceof VMThinRegionEntryLongKey) {
+//      factory.returnToPool((VMThinRegionEntryLongKey)this);
+//    }
   }
 
-  protected long getlastModifiedField() {
+  protected long getLastModifiedField() {
     return lastModifiedUpdater.get(this);
   }
-
   protected boolean compareAndSetLastModifiedField(long expectedValue, long 
newValue) {
     return lastModifiedUpdater.compareAndSet(this, expectedValue, newValue);
   }
-
   /**
    * @see HashEntry#getEntryHash()
    */
   public final int getEntryHash() {
     return this.hash;
   }
-
   protected void setEntryHash(int v) {
     this.hash = v;
   }
-
   /**
    * @see HashEntry#getNextEntry()
    */
   public final HashEntry<Object, Object> getNextEntry() {
     return this.next;
   }
-
   /**
    * @see HashEntry#setNextEntry
    */
@@ -158,23 +196,27 @@ public class VMStatsDiskRegionEntryOffHeapIntKey extends 
VMStatsDiskRegionEntryO
     this.next = n;
   }
 
+
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+  
   // disk code
+
   protected void initialize(RegionEntryContext context, Object value) {
     diskInitialize(context, value);
   }
-
   @Override
   public int updateAsyncEntrySize(EnableLRU capacityController) {
     throw new IllegalStateException("should never be called");
   }
 
+
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+  
   private void diskInitialize(RegionEntryContext context, Object value) {
-    DiskRecoveryStore drs = (DiskRecoveryStore) context;
+    DiskRecoveryStore drs = (DiskRecoveryStore)context;
     DiskStoreImpl ds = drs.getDiskStore();
     long maxOplogSize = ds.getMaxOplogSize();
-    // get appropriate instance of DiskId implementation based on maxOplogSize
+    //get appropriate instance of DiskId implementation based on maxOplogSize
     this.id = DiskId.createDiskId(maxOplogSize, true/* is persistence */, 
ds.needsLinkedList());
     Helper.initialize(this, drs, value);
   }
@@ -184,60 +226,64 @@ public class VMStatsDiskRegionEntryOffHeapIntKey extends 
VMStatsDiskRegionEntryO
    * 
    * @since GemFire 5.1
    */
-  protected DiskId id;// = new DiskId();
-
+  protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {
     return this.id;
   }
-
   @Override
   void setDiskId(RegionEntry old) {
-    this.id = ((AbstractDiskRegionEntry) old).getDiskId();
-  }
-
-  // // inlining DiskId
-  // // always have these fields
-  // /**
-  // * id consists of
-  // * most significant
-  // * 1 byte = users bits
-  // * 2-8 bytes = oplog id
-  // * least significant.
-  // *
-  // * The highest bit in the oplog id part is set to 1 if the oplog id
-  // * is negative.
-  // * @todo this field could be an int for an overflow only region
-  // */
-  // private long id;
-  // /**
-  // * Length of the bytes on disk.
-  // * This is always set. If the value is invalid then it will be set to 0.
-  // * The most significant bit is used by overflow to mark it as needing to 
be written.
-  // */
-  // protected int valueLength = 0;
-  // // have intOffset or longOffset
-  // // intOffset
-  // /**
-  // * The position in the oplog (the oplog offset) where this entry's value is
-  // * stored
-  // */
-  // private volatile int offsetInOplog;
-  // // longOffset
-  // /**
-  // * The position in the oplog (the oplog offset) where this entry's value is
-  // * stored
-  // */
-  // private volatile long offsetInOplog;
-  // // have overflowOnly or persistence
-  // // overflowOnly
-  // // no fields
-  // // persistent
-  // /** unique entry identifier * */
-  // private long keyId;
+    this.id = ((AbstractDiskRegionEntry)old).getDiskId();
+  }
+//  // inlining DiskId
+//  // always have these fields
+//  /**
+//   * id consists of
+//   * most significant
+//   * 1 byte = users bits
+//   * 2-8 bytes = oplog id
+//   * least significant.
+//   * 
+//   * The highest bit in the oplog id part is set to 1 if the oplog id
+//   * is negative.
+//   * @todo this field could be an int for an overflow only region
+//   */
+//  private long id;
+//  /**
+//   * Length of the bytes on disk.
+//   * This is always set. If the value is invalid then it will be set to 0.
+//   * The most significant bit is used by overflow to mark it as needing to 
be written.
+//   */
+//  protected int valueLength = 0;
+//  // have intOffset or longOffset
+//  // intOffset
+//  /**
+//   * The position in the oplog (the oplog offset) where this entry's value is
+//   * stored
+//   */
+//  private volatile int offsetInOplog;
+//  // longOffset
+//  /**
+//   * The position in the oplog (the oplog offset) where this entry's value is
+//   * stored
+//   */
+//  private volatile long offsetInOplog;
+//  // have overflowOnly or persistence
+//  // overflowOnly
+//  // no fields
+//  // persistent
+//  /** unique entry identifier * */
+//  private long keyId;
+
+  
+
+
+
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+  
   // stats code
   @Override
-  public final void updateStatsForGet(boolean hit, long time) {
+  public final void updateStatsForGet(boolean hit, long time)
+  {
     setLastAccessed(time);
     if (hit) {
       incrementHitCount();
@@ -245,57 +291,51 @@ public class VMStatsDiskRegionEntryOffHeapIntKey extends 
VMStatsDiskRegionEntryO
       incrementMissCount();
     }
   }
-
   @Override
   protected final void setLastModifiedAndAccessedTimes(long lastModified, long 
lastAccessed) {
     _setLastModified(lastModified);
-    if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
+    if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) { 
       setLastAccessed(lastAccessed);
     }
   }
-
   private volatile long lastAccessed;
   private volatile int hitCount;
   private volatile int missCount;
-  private static final 
AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryOffHeapIntKey> hitCountUpdater =
-      
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapIntKey.class, 
"hitCount");
-  private static final 
AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryOffHeapIntKey> missCountUpdater 
=
-      
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapIntKey.class, 
"missCount");
-
+  
+  private static final 
AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryOffHeapIntKey> hitCountUpdater 
+    = 
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapIntKey.class, 
"hitCount");
+  private static final 
AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryOffHeapIntKey> missCountUpdater 
+    = 
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapIntKey.class, 
"missCount");
+  
   @Override
   public final long getLastAccessed() throws 
InternalStatisticsDisabledException {
     return this.lastAccessed;
   }
-
   private void setLastAccessed(long lastAccessed) {
     this.lastAccessed = lastAccessed;
   }
-
   @Override
   public final long getHitCount() throws InternalStatisticsDisabledException {
     return this.hitCount & 0xFFFFFFFFL;
   }
-
   @Override
   public final long getMissCount() throws InternalStatisticsDisabledException {
     return this.missCount & 0xFFFFFFFFL;
   }
-
   private void incrementHitCount() {
     hitCountUpdater.incrementAndGet(this);
   }
-
   private void incrementMissCount() {
     missCountUpdater.incrementAndGet(this);
   }
-
   @Override
   public final void resetCounts() throws InternalStatisticsDisabledException {
-    hitCountUpdater.set(this, 0);
-    missCountUpdater.set(this, 0);
+    hitCountUpdater.set(this,0);
+    missCountUpdater.set(this,0);
   }
 
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+  
   @Override
   public final void txDidDestroy(long currTime) {
     setLastModified(currTime);
@@ -303,21 +343,30 @@ public class VMStatsDiskRegionEntryOffHeapIntKey extends 
VMStatsDiskRegionEntryO
     this.hitCount = 0;
     this.missCount = 0;
   }
-
   @Override
   public boolean hasStats() {
     return true;
   }
 
+  
+
+  
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+  
   // key code
-  private final int key;
 
+
+
+
+
+
+
+
+  private final int key;
   @Override
   public final Object getKey() {
     return this.key;
   }
-
   @Override
   public boolean isKeyEqual(Object k) {
     if (k instanceof Integer) {
@@ -325,5 +374,8 @@ public class VMStatsDiskRegionEntryOffHeapIntKey extends 
VMStatsDiskRegionEntryO
     }
     return false;
   }
+  
+
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
 }
+

http://git-wip-us.apache.org/repos/asf/geode/blob/d4f23332/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapLongKey.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapLongKey.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapLongKey.java
index 49b2b12..129b1ae 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapLongKey.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapLongKey.java
@@ -15,74 +15,112 @@
 package org.apache.geode.internal.cache;
 
 // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
+
+
+
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
+
+
+
 import org.apache.geode.internal.cache.lru.EnableLRU;
+
+
 import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
+
 import org.apache.geode.internal.InternalStatisticsDisabledException;
+
 import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
 import org.apache.geode.internal.offheap.annotations.Released;
 import org.apache.geode.internal.offheap.annotations.Retained;
 import org.apache.geode.internal.offheap.annotations.Unretained;
+
 import 
org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
 
 // macros whose definition changes this class:
-// disk: DISK
+// disk: 1
 // lru: LRU
-// stats: STATS
+// stats: 1
 // versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
 // One of the following key macros must be defined:
 // key object: KEY_OBJECT
 // key int: KEY_INT
-// key long: KEY_LONG
+// key long: 1
 // key uuid: KEY_UUID
 // key string1: KEY_STRING1
 // key string2: KEY_STRING2
+
 /**
  * Do not modify this class. It was generated. Instead modify 
LeafRegionEntry.cpp and then run
  * ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top 
level directory).
  */
 public class VMStatsDiskRegionEntryOffHeapLongKey extends 
VMStatsDiskRegionEntryOffHeap {
-  public VMStatsDiskRegionEntryOffHeapLongKey(RegionEntryContext context, long 
key,
-      @Retained Object value) {
-    super(context, (value instanceof RecoveredEntry ? null : value));
+  public VMStatsDiskRegionEntryOffHeapLongKey  (RegionEntryContext context, 
long key, 
+
+      @Retained
+
+      Object value
+
+
+
+      ) {
+    super(context, 
+
+          (value instanceof RecoveredEntry ? null : value)
+
+
+
+        );
     // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
     initialize(context, value);
+
+
+
+
+
+
     this.key = key;
+
   }
 
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+  
   // common code
   protected int hash;
   private HashEntry<Object, Object> next;
   @SuppressWarnings("unused")
   private volatile long lastModified;
-  private static final 
AtomicLongFieldUpdater<VMStatsDiskRegionEntryOffHeapLongKey> 
lastModifiedUpdater =
-      
AtomicLongFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapLongKey.class, 
"lastModified");
+  private static final 
AtomicLongFieldUpdater<VMStatsDiskRegionEntryOffHeapLongKey> lastModifiedUpdater
+    = 
AtomicLongFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapLongKey.class, 
"lastModified");
+
   /**
    * All access done using ohAddrUpdater so it is used even though the 
compiler can not tell it is.
    */
   @SuppressWarnings("unused")
-  @Retained
-  @Released
-  private volatile long ohAddress;
+  @Retained @Released private volatile long ohAddress;
   /**
-   * I needed to add this because I wanted clear to call setValue which 
normally can only be called
-   * while the re is synced. But if I sync in that code it causes a lock 
ordering deadlock with the
-   * disk regions because they also get a rw lock in clear. Some hardware 
platforms do not support
-   * CAS on a long. If gemfire is run on one of those the 
AtomicLongFieldUpdater does a sync on the
-   * re and we will once again be deadlocked. I don't know if we support any 
of the hardware
-   * platforms that do not have a 64bit CAS. If we do then we can expect 
deadlocks on disk regions.
+   * I needed to add this because I wanted clear to call setValue which 
normally can only be called while the re is synced.
+   * But if I sync in that code it causes a lock ordering deadlock with the 
disk regions because they also get a rw lock in clear.
+   * Some hardware platforms do not support CAS on a long. If gemfire is run 
on one of those the AtomicLongFieldUpdater does a sync
+   * on the re and we will once again be deadlocked.
+   * I don't know if we support any of the hardware platforms that do not have 
a 64bit CAS. If we do then we can expect deadlocks
+   * on disk regions.
    */
-  private final static 
AtomicLongFieldUpdater<VMStatsDiskRegionEntryOffHeapLongKey> ohAddrUpdater =
-      
AtomicLongFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapLongKey.class, 
"ohAddress");
-
+  private final static 
AtomicLongFieldUpdater<VMStatsDiskRegionEntryOffHeapLongKey> ohAddrUpdater = 
AtomicLongFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapLongKey.class, 
"ohAddress");
+  
   @Override
   public Token getValueAsToken() {
     return OffHeapRegionEntryHelper.getValueAsToken(this);
   }
-
+  
   @Override
   protected Object getValueField() {
     return OffHeapRegionEntryHelper._getValue(this);
@@ -90,13 +128,18 @@ public class VMStatsDiskRegionEntryOffHeapLongKey extends 
VMStatsDiskRegionEntry
 
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
   @Override
+
   @Unretained
   protected void setValueField(@Unretained Object v) {
+
+
+
     OffHeapRegionEntryHelper.setValue(this, v);
   }
-
   @Override
+
   @Retained
+
   public Object _getValueRetain(RegionEntryContext context, boolean 
decompress) {
     return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
   }
@@ -110,47 +153,44 @@ public class VMStatsDiskRegionEntryOffHeapLongKey extends 
VMStatsDiskRegionEntry
   public boolean setAddress(long expectedAddr, long newAddr) {
     return ohAddrUpdater.compareAndSet(this, expectedAddr, newAddr);
   }
-
+  
   @Override
+
   @Released
+
   public void release() {
     OffHeapRegionEntryHelper.releaseEntry(this);
   }
-
+  
   @Override
   public void returnToPool() {
     // Deadcoded for now; never was working
-    // if (this instanceof VMThinRegionEntryLongKey) {
-    // factory.returnToPool((VMThinRegionEntryLongKey)this);
-    // }
+//    if (this instanceof VMThinRegionEntryLongKey) {
+//      factory.returnToPool((VMThinRegionEntryLongKey)this);
+//    }
   }
 
-  protected long getlastModifiedField() {
+  protected long getLastModifiedField() {
     return lastModifiedUpdater.get(this);
   }
-
   protected boolean compareAndSetLastModifiedField(long expectedValue, long 
newValue) {
     return lastModifiedUpdater.compareAndSet(this, expectedValue, newValue);
   }
-
   /**
    * @see HashEntry#getEntryHash()
    */
   public final int getEntryHash() {
     return this.hash;
   }
-
   protected void setEntryHash(int v) {
     this.hash = v;
   }
-
   /**
    * @see HashEntry#getNextEntry()
    */
   public final HashEntry<Object, Object> getNextEntry() {
     return this.next;
   }
-
   /**
    * @see HashEntry#setNextEntry
    */
@@ -158,23 +198,27 @@ public class VMStatsDiskRegionEntryOffHeapLongKey extends 
VMStatsDiskRegionEntry
     this.next = n;
   }
 
+
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+  
   // disk code
+
   protected void initialize(RegionEntryContext context, Object value) {
     diskInitialize(context, value);
   }
-
   @Override
   public int updateAsyncEntrySize(EnableLRU capacityController) {
     throw new IllegalStateException("should never be called");
   }
 
+
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+  
   private void diskInitialize(RegionEntryContext context, Object value) {
-    DiskRecoveryStore drs = (DiskRecoveryStore) context;
+    DiskRecoveryStore drs = (DiskRecoveryStore)context;
     DiskStoreImpl ds = drs.getDiskStore();
     long maxOplogSize = ds.getMaxOplogSize();
-    // get appropriate instance of DiskId implementation based on maxOplogSize
+    //get appropriate instance of DiskId implementation based on maxOplogSize
     this.id = DiskId.createDiskId(maxOplogSize, true/* is persistence */, 
ds.needsLinkedList());
     Helper.initialize(this, drs, value);
   }
@@ -184,60 +228,64 @@ public class VMStatsDiskRegionEntryOffHeapLongKey extends 
VMStatsDiskRegionEntry
    * 
    * @since GemFire 5.1
    */
-  protected DiskId id;// = new DiskId();
-
+  protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {
     return this.id;
   }
-
   @Override
   void setDiskId(RegionEntry old) {
-    this.id = ((AbstractDiskRegionEntry) old).getDiskId();
-  }
-
-  // // inlining DiskId
-  // // always have these fields
-  // /**
-  // * id consists of
-  // * most significant
-  // * 1 byte = users bits
-  // * 2-8 bytes = oplog id
-  // * least significant.
-  // *
-  // * The highest bit in the oplog id part is set to 1 if the oplog id
-  // * is negative.
-  // * @todo this field could be an int for an overflow only region
-  // */
-  // private long id;
-  // /**
-  // * Length of the bytes on disk.
-  // * This is always set. If the value is invalid then it will be set to 0.
-  // * The most significant bit is used by overflow to mark it as needing to 
be written.
-  // */
-  // protected int valueLength = 0;
-  // // have intOffset or longOffset
-  // // intOffset
-  // /**
-  // * The position in the oplog (the oplog offset) where this entry's value is
-  // * stored
-  // */
-  // private volatile int offsetInOplog;
-  // // longOffset
-  // /**
-  // * The position in the oplog (the oplog offset) where this entry's value is
-  // * stored
-  // */
-  // private volatile long offsetInOplog;
-  // // have overflowOnly or persistence
-  // // overflowOnly
-  // // no fields
-  // // persistent
-  // /** unique entry identifier * */
-  // private long keyId;
+    this.id = ((AbstractDiskRegionEntry)old).getDiskId();
+  }
+//  // inlining DiskId
+//  // always have these fields
+//  /**
+//   * id consists of
+//   * most significant
+//   * 1 byte = users bits
+//   * 2-8 bytes = oplog id
+//   * least significant.
+//   * 
+//   * The highest bit in the oplog id part is set to 1 if the oplog id
+//   * is negative.
+//   * @todo this field could be an int for an overflow only region
+//   */
+//  private long id;
+//  /**
+//   * Length of the bytes on disk.
+//   * This is always set. If the value is invalid then it will be set to 0.
+//   * The most significant bit is used by overflow to mark it as needing to 
be written.
+//   */
+//  protected int valueLength = 0;
+//  // have intOffset or longOffset
+//  // intOffset
+//  /**
+//   * The position in the oplog (the oplog offset) where this entry's value is
+//   * stored
+//   */
+//  private volatile int offsetInOplog;
+//  // longOffset
+//  /**
+//   * The position in the oplog (the oplog offset) where this entry's value is
+//   * stored
+//   */
+//  private volatile long offsetInOplog;
+//  // have overflowOnly or persistence
+//  // overflowOnly
+//  // no fields
+//  // persistent
+//  /** unique entry identifier * */
+//  private long keyId;
+
+  
+
+
+
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+  
   // stats code
   @Override
-  public final void updateStatsForGet(boolean hit, long time) {
+  public final void updateStatsForGet(boolean hit, long time)
+  {
     setLastAccessed(time);
     if (hit) {
       incrementHitCount();
@@ -245,57 +293,51 @@ public class VMStatsDiskRegionEntryOffHeapLongKey extends 
VMStatsDiskRegionEntry
       incrementMissCount();
     }
   }
-
   @Override
   protected final void setLastModifiedAndAccessedTimes(long lastModified, long 
lastAccessed) {
     _setLastModified(lastModified);
-    if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
+    if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) { 
       setLastAccessed(lastAccessed);
     }
   }
-
   private volatile long lastAccessed;
   private volatile int hitCount;
   private volatile int missCount;
-  private static final 
AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryOffHeapLongKey> hitCountUpdater 
=
-      
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapLongKey.class,
 "hitCount");
-  private static final 
AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryOffHeapLongKey> 
missCountUpdater =
-      
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapLongKey.class,
 "missCount");
-
+  
+  private static final 
AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryOffHeapLongKey> hitCountUpdater 
+    = 
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapLongKey.class,
 "hitCount");
+  private static final 
AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryOffHeapLongKey> 
missCountUpdater 
+    = 
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapLongKey.class,
 "missCount");
+  
   @Override
   public final long getLastAccessed() throws 
InternalStatisticsDisabledException {
     return this.lastAccessed;
   }
-
   private void setLastAccessed(long lastAccessed) {
     this.lastAccessed = lastAccessed;
   }
-
   @Override
   public final long getHitCount() throws InternalStatisticsDisabledException {
     return this.hitCount & 0xFFFFFFFFL;
   }
-
   @Override
   public final long getMissCount() throws InternalStatisticsDisabledException {
     return this.missCount & 0xFFFFFFFFL;
   }
-
   private void incrementHitCount() {
     hitCountUpdater.incrementAndGet(this);
   }
-
   private void incrementMissCount() {
     missCountUpdater.incrementAndGet(this);
   }
-
   @Override
   public final void resetCounts() throws InternalStatisticsDisabledException {
-    hitCountUpdater.set(this, 0);
-    missCountUpdater.set(this, 0);
+    hitCountUpdater.set(this,0);
+    missCountUpdater.set(this,0);
   }
 
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+  
   @Override
   public final void txDidDestroy(long currTime) {
     setLastModified(currTime);
@@ -303,21 +345,23 @@ public class VMStatsDiskRegionEntryOffHeapLongKey extends 
VMStatsDiskRegionEntry
     this.hitCount = 0;
     this.missCount = 0;
   }
-
   @Override
   public boolean hasStats() {
     return true;
   }
 
+  
+
+  
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+  
   // key code
-  private final long key;
 
+  private final long key;
   @Override
   public final Object getKey() {
     return this.key;
   }
-
   @Override
   public boolean isKeyEqual(Object k) {
     if (k instanceof Long) {
@@ -325,5 +369,8 @@ public class VMStatsDiskRegionEntryOffHeapLongKey extends 
VMStatsDiskRegionEntry
     }
     return false;
   }
+  
+
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
 }
+

http://git-wip-us.apache.org/repos/asf/geode/blob/d4f23332/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapObjectKey.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapObjectKey.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapObjectKey.java
index f7d3b96..24190ee 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapObjectKey.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapObjectKey.java
@@ -15,75 +15,108 @@
 package org.apache.geode.internal.cache;
 
 // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
+
+
+
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
+
+
+
 import org.apache.geode.internal.cache.lru.EnableLRU;
+
+
 import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
+
 import org.apache.geode.internal.InternalStatisticsDisabledException;
+
 import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
 import org.apache.geode.internal.offheap.annotations.Released;
 import org.apache.geode.internal.offheap.annotations.Retained;
 import org.apache.geode.internal.offheap.annotations.Unretained;
+
 import 
org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
 
 // macros whose definition changes this class:
-// disk: DISK
+// disk: 1
 // lru: LRU
-// stats: STATS
+// stats: 1
 // versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
 // One of the following key macros must be defined:
-// key object: KEY_OBJECT
+// key object: 1
 // key int: KEY_INT
 // key long: KEY_LONG
 // key uuid: KEY_UUID
 // key string1: KEY_STRING1
 // key string2: KEY_STRING2
+
 /**
  * Do not modify this class. It was generated. Instead modify 
LeafRegionEntry.cpp and then run
  * ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top 
level directory).
  */
 public class VMStatsDiskRegionEntryOffHeapObjectKey extends 
VMStatsDiskRegionEntryOffHeap {
-  public VMStatsDiskRegionEntryOffHeapObjectKey(RegionEntryContext context, 
Object key,
-      @Retained Object value) {
-    super(context, (value instanceof RecoveredEntry ? null : value));
+  public VMStatsDiskRegionEntryOffHeapObjectKey  (RegionEntryContext context, 
Object key, 
+
+      @Retained
+
+      Object value
+
+
+
+      ) {
+    super(context, 
+
+          (value instanceof RecoveredEntry ? null : value)
+
+
+
+        );
     // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
     initialize(context, value);
+
+
     this.key = key;
+
   }
 
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+  
   // common code
   protected int hash;
   private HashEntry<Object, Object> next;
   @SuppressWarnings("unused")
   private volatile long lastModified;
-  private static final 
AtomicLongFieldUpdater<VMStatsDiskRegionEntryOffHeapObjectKey> 
lastModifiedUpdater =
-      
AtomicLongFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapObjectKey.class,
-          "lastModified");
+  private static final 
AtomicLongFieldUpdater<VMStatsDiskRegionEntryOffHeapObjectKey> 
lastModifiedUpdater
+    = 
AtomicLongFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapObjectKey.class, 
"lastModified");
+
   /**
    * All access done using ohAddrUpdater so it is used even though the 
compiler can not tell it is.
    */
   @SuppressWarnings("unused")
-  @Retained
-  @Released
-  private volatile long ohAddress;
+  @Retained @Released private volatile long ohAddress;
   /**
-   * I needed to add this because I wanted clear to call setValue which 
normally can only be called
-   * while the re is synced. But if I sync in that code it causes a lock 
ordering deadlock with the
-   * disk regions because they also get a rw lock in clear. Some hardware 
platforms do not support
-   * CAS on a long. If gemfire is run on one of those the 
AtomicLongFieldUpdater does a sync on the
-   * re and we will once again be deadlocked. I don't know if we support any 
of the hardware
-   * platforms that do not have a 64bit CAS. If we do then we can expect 
deadlocks on disk regions.
+   * I needed to add this because I wanted clear to call setValue which 
normally can only be called while the re is synced.
+   * But if I sync in that code it causes a lock ordering deadlock with the 
disk regions because they also get a rw lock in clear.
+   * Some hardware platforms do not support CAS on a long. If gemfire is run 
on one of those the AtomicLongFieldUpdater does a sync
+   * on the re and we will once again be deadlocked.
+   * I don't know if we support any of the hardware platforms that do not have 
a 64bit CAS. If we do then we can expect deadlocks
+   * on disk regions.
    */
-  private final static 
AtomicLongFieldUpdater<VMStatsDiskRegionEntryOffHeapObjectKey> ohAddrUpdater =
-      
AtomicLongFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapObjectKey.class, 
"ohAddress");
-
+  private final static 
AtomicLongFieldUpdater<VMStatsDiskRegionEntryOffHeapObjectKey> ohAddrUpdater = 
AtomicLongFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapObjectKey.class, 
"ohAddress");
+  
   @Override
   public Token getValueAsToken() {
     return OffHeapRegionEntryHelper.getValueAsToken(this);
   }
-
+  
   @Override
   protected Object getValueField() {
     return OffHeapRegionEntryHelper._getValue(this);
@@ -91,13 +124,18 @@ public class VMStatsDiskRegionEntryOffHeapObjectKey 
extends VMStatsDiskRegionEnt
 
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
   @Override
+
   @Unretained
   protected void setValueField(@Unretained Object v) {
+
+
+
     OffHeapRegionEntryHelper.setValue(this, v);
   }
-
   @Override
+
   @Retained
+
   public Object _getValueRetain(RegionEntryContext context, boolean 
decompress) {
     return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
   }
@@ -111,47 +149,44 @@ public class VMStatsDiskRegionEntryOffHeapObjectKey 
extends VMStatsDiskRegionEnt
   public boolean setAddress(long expectedAddr, long newAddr) {
     return ohAddrUpdater.compareAndSet(this, expectedAddr, newAddr);
   }
-
+  
   @Override
+
   @Released
+
   public void release() {
     OffHeapRegionEntryHelper.releaseEntry(this);
   }
-
+  
   @Override
   public void returnToPool() {
     // Deadcoded for now; never was working
-    // if (this instanceof VMThinRegionEntryLongKey) {
-    // factory.returnToPool((VMThinRegionEntryLongKey)this);
-    // }
+//    if (this instanceof VMThinRegionEntryLongKey) {
+//      factory.returnToPool((VMThinRegionEntryLongKey)this);
+//    }
   }
 
-  protected long getlastModifiedField() {
+  protected long getLastModifiedField() {
     return lastModifiedUpdater.get(this);
   }
-
   protected boolean compareAndSetLastModifiedField(long expectedValue, long 
newValue) {
     return lastModifiedUpdater.compareAndSet(this, expectedValue, newValue);
   }
-
   /**
    * @see HashEntry#getEntryHash()
    */
   public final int getEntryHash() {
     return this.hash;
   }
-
   protected void setEntryHash(int v) {
     this.hash = v;
   }
-
   /**
    * @see HashEntry#getNextEntry()
    */
   public final HashEntry<Object, Object> getNextEntry() {
     return this.next;
   }
-
   /**
    * @see HashEntry#setNextEntry
    */
@@ -159,23 +194,27 @@ public class VMStatsDiskRegionEntryOffHeapObjectKey 
extends VMStatsDiskRegionEnt
     this.next = n;
   }
 
+
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+  
   // disk code
+
   protected void initialize(RegionEntryContext context, Object value) {
     diskInitialize(context, value);
   }
-
   @Override
   public int updateAsyncEntrySize(EnableLRU capacityController) {
     throw new IllegalStateException("should never be called");
   }
 
+
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+  
   private void diskInitialize(RegionEntryContext context, Object value) {
-    DiskRecoveryStore drs = (DiskRecoveryStore) context;
+    DiskRecoveryStore drs = (DiskRecoveryStore)context;
     DiskStoreImpl ds = drs.getDiskStore();
     long maxOplogSize = ds.getMaxOplogSize();
-    // get appropriate instance of DiskId implementation based on maxOplogSize
+    //get appropriate instance of DiskId implementation based on maxOplogSize
     this.id = DiskId.createDiskId(maxOplogSize, true/* is persistence */, 
ds.needsLinkedList());
     Helper.initialize(this, drs, value);
   }
@@ -185,60 +224,64 @@ public class VMStatsDiskRegionEntryOffHeapObjectKey 
extends VMStatsDiskRegionEnt
    * 
    * @since GemFire 5.1
    */
-  protected DiskId id;// = new DiskId();
-
+  protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {
     return this.id;
   }
-
   @Override
   void setDiskId(RegionEntry old) {
-    this.id = ((AbstractDiskRegionEntry) old).getDiskId();
-  }
-
-  // // inlining DiskId
-  // // always have these fields
-  // /**
-  // * id consists of
-  // * most significant
-  // * 1 byte = users bits
-  // * 2-8 bytes = oplog id
-  // * least significant.
-  // *
-  // * The highest bit in the oplog id part is set to 1 if the oplog id
-  // * is negative.
-  // * @todo this field could be an int for an overflow only region
-  // */
-  // private long id;
-  // /**
-  // * Length of the bytes on disk.
-  // * This is always set. If the value is invalid then it will be set to 0.
-  // * The most significant bit is used by overflow to mark it as needing to 
be written.
-  // */
-  // protected int valueLength = 0;
-  // // have intOffset or longOffset
-  // // intOffset
-  // /**
-  // * The position in the oplog (the oplog offset) where this entry's value is
-  // * stored
-  // */
-  // private volatile int offsetInOplog;
-  // // longOffset
-  // /**
-  // * The position in the oplog (the oplog offset) where this entry's value is
-  // * stored
-  // */
-  // private volatile long offsetInOplog;
-  // // have overflowOnly or persistence
-  // // overflowOnly
-  // // no fields
-  // // persistent
-  // /** unique entry identifier * */
-  // private long keyId;
+    this.id = ((AbstractDiskRegionEntry)old).getDiskId();
+  }
+//  // inlining DiskId
+//  // always have these fields
+//  /**
+//   * id consists of
+//   * most significant
+//   * 1 byte = users bits
+//   * 2-8 bytes = oplog id
+//   * least significant.
+//   * 
+//   * The highest bit in the oplog id part is set to 1 if the oplog id
+//   * is negative.
+//   * @todo this field could be an int for an overflow only region
+//   */
+//  private long id;
+//  /**
+//   * Length of the bytes on disk.
+//   * This is always set. If the value is invalid then it will be set to 0.
+//   * The most significant bit is used by overflow to mark it as needing to 
be written.
+//   */
+//  protected int valueLength = 0;
+//  // have intOffset or longOffset
+//  // intOffset
+//  /**
+//   * The position in the oplog (the oplog offset) where this entry's value is
+//   * stored
+//   */
+//  private volatile int offsetInOplog;
+//  // longOffset
+//  /**
+//   * The position in the oplog (the oplog offset) where this entry's value is
+//   * stored
+//   */
+//  private volatile long offsetInOplog;
+//  // have overflowOnly or persistence
+//  // overflowOnly
+//  // no fields
+//  // persistent
+//  /** unique entry identifier * */
+//  private long keyId;
+
+  
+
+
+
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+  
   // stats code
   @Override
-  public final void updateStatsForGet(boolean hit, long time) {
+  public final void updateStatsForGet(boolean hit, long time)
+  {
     setLastAccessed(time);
     if (hit) {
       incrementHitCount();
@@ -246,59 +289,51 @@ public class VMStatsDiskRegionEntryOffHeapObjectKey 
extends VMStatsDiskRegionEnt
       incrementMissCount();
     }
   }
-
   @Override
   protected final void setLastModifiedAndAccessedTimes(long lastModified, long 
lastAccessed) {
     _setLastModified(lastModified);
-    if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
+    if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) { 
       setLastAccessed(lastAccessed);
     }
   }
-
   private volatile long lastAccessed;
   private volatile int hitCount;
   private volatile int missCount;
-  private static final 
AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryOffHeapObjectKey> 
hitCountUpdater =
-      
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapObjectKey.class,
-          "hitCount");
-  private static final 
AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryOffHeapObjectKey> 
missCountUpdater =
-      
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapObjectKey.class,
-          "missCount");
-
+  
+  private static final 
AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryOffHeapObjectKey> 
hitCountUpdater 
+    = 
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapObjectKey.class,
 "hitCount");
+  private static final 
AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryOffHeapObjectKey> 
missCountUpdater 
+    = 
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapObjectKey.class,
 "missCount");
+  
   @Override
   public final long getLastAccessed() throws 
InternalStatisticsDisabledException {
     return this.lastAccessed;
   }
-
   private void setLastAccessed(long lastAccessed) {
     this.lastAccessed = lastAccessed;
   }
-
   @Override
   public final long getHitCount() throws InternalStatisticsDisabledException {
     return this.hitCount & 0xFFFFFFFFL;
   }
-
   @Override
   public final long getMissCount() throws InternalStatisticsDisabledException {
     return this.missCount & 0xFFFFFFFFL;
   }
-
   private void incrementHitCount() {
     hitCountUpdater.incrementAndGet(this);
   }
-
   private void incrementMissCount() {
     missCountUpdater.incrementAndGet(this);
   }
-
   @Override
   public final void resetCounts() throws InternalStatisticsDisabledException {
-    hitCountUpdater.set(this, 0);
-    missCountUpdater.set(this, 0);
+    hitCountUpdater.set(this,0);
+    missCountUpdater.set(this,0);
   }
 
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+  
   @Override
   public final void txDidDestroy(long currTime) {
     setLastModified(currTime);
@@ -306,19 +341,25 @@ public class VMStatsDiskRegionEntryOffHeapObjectKey 
extends VMStatsDiskRegionEnt
     this.hitCount = 0;
     this.missCount = 0;
   }
-
   @Override
   public boolean hasStats() {
     return true;
   }
 
+  
+
+  
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+  
   // key code
-  private final Object key;
 
+  private final Object key;
   @Override
   public final Object getKey() {
     return this.key;
   }
+
+
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
 }
+

http://git-wip-us.apache.org/repos/asf/geode/blob/d4f23332/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey1.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey1.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey1.java
index 9902c2f..cee5c3c 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey1.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey1.java
@@ -15,92 +15,123 @@
 package org.apache.geode.internal.cache;
 
 // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
+
+
+
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
+
+
+
 import org.apache.geode.internal.cache.lru.EnableLRU;
+
+
 import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
+
 import org.apache.geode.internal.InternalStatisticsDisabledException;
+
 import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
 import org.apache.geode.internal.offheap.annotations.Released;
 import org.apache.geode.internal.offheap.annotations.Retained;
 import org.apache.geode.internal.offheap.annotations.Unretained;
+
 import 
org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
 
 // macros whose definition changes this class:
-// disk: DISK
+// disk: 1
 // lru: LRU
-// stats: STATS
+// stats: 1
 // versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
 // One of the following key macros must be defined:
 // key object: KEY_OBJECT
 // key int: KEY_INT
 // key long: KEY_LONG
 // key uuid: KEY_UUID
-// key string1: KEY_STRING1
+// key string1: 1
 // key string2: KEY_STRING2
+
 /**
  * Do not modify this class. It was generated. Instead modify 
LeafRegionEntry.cpp and then run
  * ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top 
level directory).
  */
 public class VMStatsDiskRegionEntryOffHeapStringKey1 extends 
VMStatsDiskRegionEntryOffHeap {
-  public VMStatsDiskRegionEntryOffHeapStringKey1(RegionEntryContext context, 
String key,
-      @Retained Object value, boolean byteEncode) {
-    super(context, (value instanceof RecoveredEntry ? null : value));
+  public VMStatsDiskRegionEntryOffHeapStringKey1  (RegionEntryContext context, 
String key, 
+
+      @Retained
+
+      Object value
+
+      , boolean byteEncode
+
+      ) {
+    super(context, 
+
+          (value instanceof RecoveredEntry ? null : value)
+
+
+
+        );
     // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
     initialize(context, value);
+
     // caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
     long tmpBits1 = 0L;
     if (byteEncode) {
-      for (int i = key.length() - 1; i >= 0; i--) {
-        // Note: we know each byte is <= 0x7f so the "& 0xff" is not needed. 
But I added it in to
-        // keep findbugs happy.
-        tmpBits1 |= (byte) key.charAt(i) & 0xff;
+      for (int i=key.length()-1; i >= 0; i--) {
+        // Note: we know each byte is <= 0x7f so the "& 0xff" is not needed. 
But I added it in to keep findbugs happy.
+        tmpBits1 |= (byte)key.charAt(i) & 0xff;
         tmpBits1 <<= 8;
       }
-      tmpBits1 |= 1 << 6;
+      tmpBits1 |= 1<<6;
     } else {
-      for (int i = key.length() - 1; i >= 0; i--) {
+      for (int i=key.length()-1; i >= 0; i--) {
         tmpBits1 |= key.charAt(i);
         tmpBits1 <<= 16;
       }
     }
     tmpBits1 |= key.length();
     this.bits1 = tmpBits1;
+
   }
 
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+  
   // common code
   protected int hash;
   private HashEntry<Object, Object> next;
   @SuppressWarnings("unused")
   private volatile long lastModified;
-  private static final 
AtomicLongFieldUpdater<VMStatsDiskRegionEntryOffHeapStringKey1> 
lastModifiedUpdater =
-      
AtomicLongFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapStringKey1.class,
-          "lastModified");
+  private static final 
AtomicLongFieldUpdater<VMStatsDiskRegionEntryOffHeapStringKey1> 
lastModifiedUpdater
+    = 
AtomicLongFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapStringKey1.class,
 "lastModified");
+
   /**
    * All access done using ohAddrUpdater so it is used even though the 
compiler can not tell it is.
    */
   @SuppressWarnings("unused")
-  @Retained
-  @Released
-  private volatile long ohAddress;
+  @Retained @Released private volatile long ohAddress;
   /**
-   * I needed to add this because I wanted clear to call setValue which 
normally can only be called
-   * while the re is synced. But if I sync in that code it causes a lock 
ordering deadlock with the
-   * disk regions because they also get a rw lock in clear. Some hardware 
platforms do not support
-   * CAS on a long. If gemfire is run on one of those the 
AtomicLongFieldUpdater does a sync on the
-   * re and we will once again be deadlocked. I don't know if we support any 
of the hardware
-   * platforms that do not have a 64bit CAS. If we do then we can expect 
deadlocks on disk regions.
+   * I needed to add this because I wanted clear to call setValue which 
normally can only be called while the re is synced.
+   * But if I sync in that code it causes a lock ordering deadlock with the 
disk regions because they also get a rw lock in clear.
+   * Some hardware platforms do not support CAS on a long. If gemfire is run 
on one of those the AtomicLongFieldUpdater does a sync
+   * on the re and we will once again be deadlocked.
+   * I don't know if we support any of the hardware platforms that do not have 
a 64bit CAS. If we do then we can expect deadlocks
+   * on disk regions.
    */
-  private final static 
AtomicLongFieldUpdater<VMStatsDiskRegionEntryOffHeapStringKey1> ohAddrUpdater =
-      
AtomicLongFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapStringKey1.class,
 "ohAddress");
-
+  private final static 
AtomicLongFieldUpdater<VMStatsDiskRegionEntryOffHeapStringKey1> ohAddrUpdater = 
AtomicLongFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapStringKey1.class,
 "ohAddress");
+  
   @Override
   public Token getValueAsToken() {
     return OffHeapRegionEntryHelper.getValueAsToken(this);
   }
-
+  
   @Override
   protected Object getValueField() {
     return OffHeapRegionEntryHelper._getValue(this);
@@ -108,13 +139,18 @@ public class VMStatsDiskRegionEntryOffHeapStringKey1 
extends VMStatsDiskRegionEn
 
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
   @Override
+
   @Unretained
   protected void setValueField(@Unretained Object v) {
+
+
+
     OffHeapRegionEntryHelper.setValue(this, v);
   }
-
   @Override
+
   @Retained
+
   public Object _getValueRetain(RegionEntryContext context, boolean 
decompress) {
     return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
   }
@@ -128,47 +164,44 @@ public class VMStatsDiskRegionEntryOffHeapStringKey1 
extends VMStatsDiskRegionEn
   public boolean setAddress(long expectedAddr, long newAddr) {
     return ohAddrUpdater.compareAndSet(this, expectedAddr, newAddr);
   }
-
+  
   @Override
+
   @Released
+
   public void release() {
     OffHeapRegionEntryHelper.releaseEntry(this);
   }
-
+  
   @Override
   public void returnToPool() {
     // Deadcoded for now; never was working
-    // if (this instanceof VMThinRegionEntryLongKey) {
-    // factory.returnToPool((VMThinRegionEntryLongKey)this);
-    // }
+//    if (this instanceof VMThinRegionEntryLongKey) {
+//      factory.returnToPool((VMThinRegionEntryLongKey)this);
+//    }
   }
 
-  protected long getlastModifiedField() {
+  protected long getLastModifiedField() {
     return lastModifiedUpdater.get(this);
   }
-
   protected boolean compareAndSetLastModifiedField(long expectedValue, long 
newValue) {
     return lastModifiedUpdater.compareAndSet(this, expectedValue, newValue);
   }
-
   /**
    * @see HashEntry#getEntryHash()
    */
   public final int getEntryHash() {
     return this.hash;
   }
-
   protected void setEntryHash(int v) {
     this.hash = v;
   }
-
   /**
    * @see HashEntry#getNextEntry()
    */
   public final HashEntry<Object, Object> getNextEntry() {
     return this.next;
   }
-
   /**
    * @see HashEntry#setNextEntry
    */
@@ -176,23 +209,27 @@ public class VMStatsDiskRegionEntryOffHeapStringKey1 
extends VMStatsDiskRegionEn
     this.next = n;
   }
 
+
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+  
   // disk code
+
   protected void initialize(RegionEntryContext context, Object value) {
     diskInitialize(context, value);
   }
-
   @Override
   public int updateAsyncEntrySize(EnableLRU capacityController) {
     throw new IllegalStateException("should never be called");
   }
 
+
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+  
   private void diskInitialize(RegionEntryContext context, Object value) {
-    DiskRecoveryStore drs = (DiskRecoveryStore) context;
+    DiskRecoveryStore drs = (DiskRecoveryStore)context;
     DiskStoreImpl ds = drs.getDiskStore();
     long maxOplogSize = ds.getMaxOplogSize();
-    // get appropriate instance of DiskId implementation based on maxOplogSize
+    //get appropriate instance of DiskId implementation based on maxOplogSize
     this.id = DiskId.createDiskId(maxOplogSize, true/* is persistence */, 
ds.needsLinkedList());
     Helper.initialize(this, drs, value);
   }
@@ -202,60 +239,64 @@ public class VMStatsDiskRegionEntryOffHeapStringKey1 
extends VMStatsDiskRegionEn
    * 
    * @since GemFire 5.1
    */
-  protected DiskId id;// = new DiskId();
-
+  protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {
     return this.id;
   }
-
   @Override
   void setDiskId(RegionEntry old) {
-    this.id = ((AbstractDiskRegionEntry) old).getDiskId();
-  }
-
-  // // inlining DiskId
-  // // always have these fields
-  // /**
-  // * id consists of
-  // * most significant
-  // * 1 byte = users bits
-  // * 2-8 bytes = oplog id
-  // * least significant.
-  // *
-  // * The highest bit in the oplog id part is set to 1 if the oplog id
-  // * is negative.
-  // * @todo this field could be an int for an overflow only region
-  // */
-  // private long id;
-  // /**
-  // * Length of the bytes on disk.
-  // * This is always set. If the value is invalid then it will be set to 0.
-  // * The most significant bit is used by overflow to mark it as needing to 
be written.
-  // */
-  // protected int valueLength = 0;
-  // // have intOffset or longOffset
-  // // intOffset
-  // /**
-  // * The position in the oplog (the oplog offset) where this entry's value is
-  // * stored
-  // */
-  // private volatile int offsetInOplog;
-  // // longOffset
-  // /**
-  // * The position in the oplog (the oplog offset) where this entry's value is
-  // * stored
-  // */
-  // private volatile long offsetInOplog;
-  // // have overflowOnly or persistence
-  // // overflowOnly
-  // // no fields
-  // // persistent
-  // /** unique entry identifier * */
-  // private long keyId;
+    this.id = ((AbstractDiskRegionEntry)old).getDiskId();
+  }
+//  // inlining DiskId
+//  // always have these fields
+//  /**
+//   * id consists of
+//   * most significant
+//   * 1 byte = users bits
+//   * 2-8 bytes = oplog id
+//   * least significant.
+//   * 
+//   * The highest bit in the oplog id part is set to 1 if the oplog id
+//   * is negative.
+//   * @todo this field could be an int for an overflow only region
+//   */
+//  private long id;
+//  /**
+//   * Length of the bytes on disk.
+//   * This is always set. If the value is invalid then it will be set to 0.
+//   * The most significant bit is used by overflow to mark it as needing to 
be written.
+//   */
+//  protected int valueLength = 0;
+//  // have intOffset or longOffset
+//  // intOffset
+//  /**
+//   * The position in the oplog (the oplog offset) where this entry's value is
+//   * stored
+//   */
+//  private volatile int offsetInOplog;
+//  // longOffset
+//  /**
+//   * The position in the oplog (the oplog offset) where this entry's value is
+//   * stored
+//   */
+//  private volatile long offsetInOplog;
+//  // have overflowOnly or persistence
+//  // overflowOnly
+//  // no fields
+//  // persistent
+//  /** unique entry identifier * */
+//  private long keyId;
+
+  
+
+
+
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+  
   // stats code
   @Override
-  public final void updateStatsForGet(boolean hit, long time) {
+  public final void updateStatsForGet(boolean hit, long time)
+  {
     setLastAccessed(time);
     if (hit) {
       incrementHitCount();
@@ -263,59 +304,51 @@ public class VMStatsDiskRegionEntryOffHeapStringKey1 
extends VMStatsDiskRegionEn
       incrementMissCount();
     }
   }
-
   @Override
   protected final void setLastModifiedAndAccessedTimes(long lastModified, long 
lastAccessed) {
     _setLastModified(lastModified);
-    if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
+    if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) { 
       setLastAccessed(lastAccessed);
     }
   }
-
   private volatile long lastAccessed;
   private volatile int hitCount;
   private volatile int missCount;
-  private static final 
AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryOffHeapStringKey1> 
hitCountUpdater =
-      
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapStringKey1.class,
-          "hitCount");
-  private static final 
AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryOffHeapStringKey1> 
missCountUpdater =
-      
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapStringKey1.class,
-          "missCount");
-
+  
+  private static final 
AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryOffHeapStringKey1> 
hitCountUpdater 
+    = 
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapStringKey1.class,
 "hitCount");
+  private static final 
AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryOffHeapStringKey1> 
missCountUpdater 
+    = 
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapStringKey1.class,
 "missCount");
+  
   @Override
   public final long getLastAccessed() throws 
InternalStatisticsDisabledException {
     return this.lastAccessed;
   }
-
   private void setLastAccessed(long lastAccessed) {
     this.lastAccessed = lastAccessed;
   }
-
   @Override
   public final long getHitCount() throws InternalStatisticsDisabledException {
     return this.hitCount & 0xFFFFFFFFL;
   }
-
   @Override
   public final long getMissCount() throws InternalStatisticsDisabledException {
     return this.missCount & 0xFFFFFFFFL;
   }
-
   private void incrementHitCount() {
     hitCountUpdater.incrementAndGet(this);
   }
-
   private void incrementMissCount() {
     missCountUpdater.incrementAndGet(this);
   }
-
   @Override
   public final void resetCounts() throws InternalStatisticsDisabledException {
-    hitCountUpdater.set(this, 0);
-    missCountUpdater.set(this, 0);
+    hitCountUpdater.set(this,0);
+    missCountUpdater.set(this,0);
   }
 
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+  
   @Override
   public final void txDidDestroy(long currTime) {
     setLastModified(currTime);
@@ -323,38 +356,39 @@ public class VMStatsDiskRegionEntryOffHeapStringKey1 
extends VMStatsDiskRegionEn
     this.hitCount = 0;
     this.missCount = 0;
   }
-
   @Override
   public boolean hasStats() {
     return true;
   }
 
+  
+
+  
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+  
   // key code
-  private final long bits1;
 
+  private final long bits1;
   private int getKeyLength() {
     return (int) (this.bits1 & 0x003fL);
   }
-
   private int getEncoding() {
     // 0 means encoded as char
     // 1 means encoded as bytes that are all <= 0x7f;
     return (int) (this.bits1 >> 6) & 0x03;
   }
-
   @Override
   public final Object getKey() {
     int keylen = getKeyLength();
     char[] chars = new char[keylen];
     long tmpBits1 = this.bits1;
     if (getEncoding() == 1) {
-      for (int i = 0; i < keylen; i++) {
+      for (int i=0; i < keylen; i++) {
         tmpBits1 >>= 8;
-        chars[i] = (char) (tmpBits1 & 0x00ff);
+      chars[i] = (char) (tmpBits1 & 0x00ff);
       }
     } else {
-      for (int i = 0; i < keylen; i++) {
+      for (int i=0; i < keylen; i++) {
         tmpBits1 >>= 16;
         chars[i] = (char) (tmpBits1 & 0x00FFff);
       }
@@ -363,15 +397,16 @@ public class VMStatsDiskRegionEntryOffHeapStringKey1 
extends VMStatsDiskRegionEn
   }
 
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+  
   @Override
   public boolean isKeyEqual(Object k) {
     if (k instanceof String) {
-      String str = (String) k;
+      String str = (String)k;
       int keylen = getKeyLength();
       if (str.length() == keylen) {
         long tmpBits1 = this.bits1;
         if (getEncoding() == 1) {
-          for (int i = 0; i < keylen; i++) {
+          for (int i=0; i < keylen; i++) {
             tmpBits1 >>= 8;
             char c = (char) (tmpBits1 & 0x00ff);
             if (str.charAt(i) != c) {
@@ -379,7 +414,7 @@ public class VMStatsDiskRegionEntryOffHeapStringKey1 
extends VMStatsDiskRegionEn
             }
           }
         } else {
-          for (int i = 0; i < keylen; i++) {
+          for (int i=0; i < keylen; i++) {
             tmpBits1 >>= 16;
             char c = (char) (tmpBits1 & 0x00FFff);
             if (str.charAt(i) != c) {
@@ -392,5 +427,8 @@ public class VMStatsDiskRegionEntryOffHeapStringKey1 
extends VMStatsDiskRegionEn
     }
     return false;
   }
+  
+
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
 }
+

http://git-wip-us.apache.org/repos/asf/geode/blob/d4f23332/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey2.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey2.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey2.java
index 4bd9357..b5c4b3b 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey2.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey2.java
@@ -15,58 +15,90 @@
 package org.apache.geode.internal.cache;
 
 // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
+
+
+
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
+
+
+
 import org.apache.geode.internal.cache.lru.EnableLRU;
+
+
 import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
+
 import org.apache.geode.internal.InternalStatisticsDisabledException;
+
 import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
 import org.apache.geode.internal.offheap.annotations.Released;
 import org.apache.geode.internal.offheap.annotations.Retained;
 import org.apache.geode.internal.offheap.annotations.Unretained;
+
 import 
org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
 
 // macros whose definition changes this class:
-// disk: DISK
+// disk: 1
 // lru: LRU
-// stats: STATS
+// stats: 1
 // versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
 // One of the following key macros must be defined:
 // key object: KEY_OBJECT
 // key int: KEY_INT
 // key long: KEY_LONG
 // key uuid: KEY_UUID
 // key string1: KEY_STRING1
-// key string2: KEY_STRING2
+// key string2: 1
+
 /**
  * Do not modify this class. It was generated. Instead modify 
LeafRegionEntry.cpp and then run
  * ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top 
level directory).
  */
 public class VMStatsDiskRegionEntryOffHeapStringKey2 extends 
VMStatsDiskRegionEntryOffHeap {
-  public VMStatsDiskRegionEntryOffHeapStringKey2(RegionEntryContext context, 
String key,
-      @Retained Object value, boolean byteEncode) {
-    super(context, (value instanceof RecoveredEntry ? null : value));
+  public VMStatsDiskRegionEntryOffHeapStringKey2  (RegionEntryContext context, 
String key, 
+
+      @Retained
+
+      Object value
+
+      , boolean byteEncode
+
+      ) {
+    super(context, 
+
+          (value instanceof RecoveredEntry ? null : value)
+
+
+
+        );
     // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
     initialize(context, value);
+
     // caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
     long tmpBits1 = 0L;
     long tmpBits2 = 0L;
     if (byteEncode) {
-      for (int i = key.length() - 1; i >= 0; i--) {
-        // Note: we know each byte is <= 0x7f so the "& 0xff" is not needed. 
But I added it in to
-        // keep findbugs happy.
+      for (int i=key.length()-1; i >= 0; i--) {
+        // Note: we know each byte is <= 0x7f so the "& 0xff" is not needed. 
But I added it in to keep findbugs happy.
         if (i < 7) {
-          tmpBits1 |= (byte) key.charAt(i) & 0xff;
+          tmpBits1 |= (byte)key.charAt(i) & 0xff;
           tmpBits1 <<= 8;
         } else {
           tmpBits2 <<= 8;
-          tmpBits2 |= (byte) key.charAt(i) & 0xff;
+          tmpBits2 |= (byte)key.charAt(i) & 0xff;
         }
       }
-      tmpBits1 |= 1 << 6;
+      tmpBits1 |= 1<<6;
     } else {
-      for (int i = key.length() - 1; i >= 0; i--) {
+      for (int i=key.length()-1; i >= 0; i--) {
         if (i < 3) {
           tmpBits1 |= key.charAt(i);
           tmpBits1 <<= 16;
@@ -79,40 +111,39 @@ public class VMStatsDiskRegionEntryOffHeapStringKey2 
extends VMStatsDiskRegionEn
     tmpBits1 |= key.length();
     this.bits1 = tmpBits1;
     this.bits2 = tmpBits2;
+
   }
 
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+  
   // common code
   protected int hash;
   private HashEntry<Object, Object> next;
   @SuppressWarnings("unused")
   private volatile long lastModified;
-  private static final 
AtomicLongFieldUpdater<VMStatsDiskRegionEntryOffHeapStringKey2> 
lastModifiedUpdater =
-      
AtomicLongFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapStringKey2.class,
-          "lastModified");
+  private static final 
AtomicLongFieldUpdater<VMStatsDiskRegionEntryOffHeapStringKey2> 
lastModifiedUpdater
+    = 
AtomicLongFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapStringKey2.class,
 "lastModified");
+
   /**
    * All access done using ohAddrUpdater so it is used even though the 
compiler can not tell it is.
    */
   @SuppressWarnings("unused")
-  @Retained
-  @Released
-  private volatile long ohAddress;
+  @Retained @Released private volatile long ohAddress;
   /**
-   * I needed to add this because I wanted clear to call setValue which 
normally can only be called
-   * while the re is synced. But if I sync in that code it causes a lock 
ordering deadlock with the
-   * disk regions because they also get a rw lock in clear. Some hardware 
platforms do not support
-   * CAS on a long. If gemfire is run on one of those the 
AtomicLongFieldUpdater does a sync on the
-   * re and we will once again be deadlocked. I don't know if we support any 
of the hardware
-   * platforms that do not have a 64bit CAS. If we do then we can expect 
deadlocks on disk regions.
+   * I needed to add this because I wanted clear to call setValue which 
normally can only be called while the re is synced.
+   * But if I sync in that code it causes a lock ordering deadlock with the 
disk regions because they also get a rw lock in clear.
+   * Some hardware platforms do not support CAS on a long. If gemfire is run 
on one of those the AtomicLongFieldUpdater does a sync
+   * on the re and we will once again be deadlocked.
+   * I don't know if we support any of the hardware platforms that do not have 
a 64bit CAS. If we do then we can expect deadlocks
+   * on disk regions.
    */
-  private final static 
AtomicLongFieldUpdater<VMStatsDiskRegionEntryOffHeapStringKey2> ohAddrUpdater =
-      
AtomicLongFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapStringKey2.class,
 "ohAddress");
-
+  private final static 
AtomicLongFieldUpdater<VMStatsDiskRegionEntryOffHeapStringKey2> ohAddrUpdater = 
AtomicLongFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapStringKey2.class,
 "ohAddress");
+  
   @Override
   public Token getValueAsToken() {
     return OffHeapRegionEntryHelper.getValueAsToken(this);
   }
-
+  
   @Override
   protected Object getValueField() {
     return OffHeapRegionEntryHelper._getValue(this);
@@ -120,13 +151,18 @@ public class VMStatsDiskRegionEntryOffHeapStringKey2 
extends VMStatsDiskRegionEn
 
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
   @Override
+
   @Unretained
   protected void setValueField(@Unretained Object v) {
+
+
+
     OffHeapRegionEntryHelper.setValue(this, v);
   }
-
   @Override
+
   @Retained
+
   public Object _getValueRetain(RegionEntryContext context, boolean 
decompress) {
     return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
   }
@@ -140,47 +176,44 @@ public class VMStatsDiskRegionEntryOffHeapStringKey2 
extends VMStatsDiskRegionEn
   public boolean setAddress(long expectedAddr, long newAddr) {
     return ohAddrUpdater.compareAndSet(this, expectedAddr, newAddr);
   }
-
+  
   @Override
+
   @Released
+
   public void release() {
     OffHeapRegionEntryHelper.releaseEntry(this);
   }
-
+  
   @Override
   public void returnToPool() {
     // Deadcoded for now; never was working
-    // if (this instanceof VMThinRegionEntryLongKey) {
-    // factory.returnToPool((VMThinRegionEntryLongKey)this);
-    // }
+//    if (this instanceof VMThinRegionEntryLongKey) {
+//      factory.returnToPool((VMThinRegionEntryLongKey)this);
+//    }
   }
 
-  protected long getlastModifiedField() {
+  protected long getLastModifiedField() {
     return lastModifiedUpdater.get(this);
   }
-
   protected boolean compareAndSetLastModifiedField(long expectedValue, long 
newValue) {
     return lastModifiedUpdater.compareAndSet(this, expectedValue, newValue);
   }
-
   /**
    * @see HashEntry#getEntryHash()
    */
   public final int getEntryHash() {
     return this.hash;
   }
-
   protected void setEntryHash(int v) {
     this.hash = v;
   }
-
   /**
    * @see HashEntry#getNextEntry()
    */
   public final HashEntry<Object, Object> getNextEntry() {
     return this.next;
   }
-
   /**
    * @see HashEntry#setNextEntry
    */
@@ -188,23 +221,27 @@ public class VMStatsDiskRegionEntryOffHeapStringKey2 
extends VMStatsDiskRegionEn
     this.next = n;
   }
 
+
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+  
   // disk code
+
   protected void initialize(RegionEntryContext context, Object value) {
     diskInitialize(context, value);
   }
-
   @Override
   public int updateAsyncEntrySize(EnableLRU capacityController) {
     throw new IllegalStateException("should never be called");
   }
 
+
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+  
   private void diskInitialize(RegionEntryContext context, Object value) {
-    DiskRecoveryStore drs = (DiskRecoveryStore) context;
+    DiskRecoveryStore drs = (DiskRecoveryStore)context;
     DiskStoreImpl ds = drs.getDiskStore();
     long maxOplogSize = ds.getMaxOplogSize();
-    // get appropriate instance of DiskId implementation based on maxOplogSize
+    //get appropriate instance of DiskId implementation based on maxOplogSize
     this.id = DiskId.createDiskId(maxOplogSize, true/* is persistence */, 
ds.needsLinkedList());
     Helper.initialize(this, drs, value);
   }
@@ -214,60 +251,64 @@ public class VMStatsDiskRegionEntryOffHeapStringKey2 
extends VMStatsDiskRegionEn
    * 
    * @since GemFire 5.1
    */
-  protected DiskId id;// = new DiskId();
-
+  protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {
     return this.id;
   }
-
   @Override
   void setDiskId(RegionEntry old) {
-    this.id = ((AbstractDiskRegionEntry) old).getDiskId();
-  }
-
-  // // inlining DiskId
-  // // always have these fields
-  // /**
-  // * id consists of
-  // * most significant
-  // * 1 byte = users bits
-  // * 2-8 bytes = oplog id
-  // * least significant.
-  // *
-  // * The highest bit in the oplog id part is set to 1 if the oplog id
-  // * is negative.
-  // * @todo this field could be an int for an overflow only region
-  // */
-  // private long id;
-  // /**
-  // * Length of the bytes on disk.
-  // * This is always set. If the value is invalid then it will be set to 0.
-  // * The most significant bit is used by overflow to mark it as needing to 
be written.
-  // */
-  // protected int valueLength = 0;
-  // // have intOffset or longOffset
-  // // intOffset
-  // /**
-  // * The position in the oplog (the oplog offset) where this entry's value is
-  // * stored
-  // */
-  // private volatile int offsetInOplog;
-  // // longOffset
-  // /**
-  // * The position in the oplog (the oplog offset) where this entry's value is
-  // * stored
-  // */
-  // private volatile long offsetInOplog;
-  // // have overflowOnly or persistence
-  // // overflowOnly
-  // // no fields
-  // // persistent
-  // /** unique entry identifier * */
-  // private long keyId;
+    this.id = ((AbstractDiskRegionEntry)old).getDiskId();
+  }
+//  // inlining DiskId
+//  // always have these fields
+//  /**
+//   * id consists of
+//   * most significant
+//   * 1 byte = users bits
+//   * 2-8 bytes = oplog id
+//   * least significant.
+//   * 
+//   * The highest bit in the oplog id part is set to 1 if the oplog id
+//   * is negative.
+//   * @todo this field could be an int for an overflow only region
+//   */
+//  private long id;
+//  /**
+//   * Length of the bytes on disk.
+//   * This is always set. If the value is invalid then it will be set to 0.
+//   * The most significant bit is used by overflow to mark it as needing to 
be written.
+//   */
+//  protected int valueLength = 0;
+//  // have intOffset or longOffset
+//  // intOffset
+//  /**
+//   * The position in the oplog (the oplog offset) where this entry's value is
+//   * stored
+//   */
+//  private volatile int offsetInOplog;
+//  // longOffset
+//  /**
+//   * The position in the oplog (the oplog offset) where this entry's value is
+//   * stored
+//   */
+//  private volatile long offsetInOplog;
+//  // have overflowOnly or persistence
+//  // overflowOnly
+//  // no fields
+//  // persistent
+//  /** unique entry identifier * */
+//  private long keyId;
+
+  
+
+
+
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+  
   // stats code
   @Override
-  public final void updateStatsForGet(boolean hit, long time) {
+  public final void updateStatsForGet(boolean hit, long time)
+  {
     setLastAccessed(time);
     if (hit) {
       incrementHitCount();
@@ -275,59 +316,51 @@ public class VMStatsDiskRegionEntryOffHeapStringKey2 
extends VMStatsDiskRegionEn
       incrementMissCount();
     }
   }
-
   @Override
   protected final void setLastModifiedAndAccessedTimes(long lastModified, long 
lastAccessed) {
     _setLastModified(lastModified);
-    if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
+    if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) { 
       setLastAccessed(lastAccessed);
     }
   }
-
   private volatile long lastAccessed;
   private volatile int hitCount;
   private volatile int missCount;
-  private static final 
AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryOffHeapStringKey2> 
hitCountUpdater =
-      
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapStringKey2.class,
-          "hitCount");
-  private static final 
AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryOffHeapStringKey2> 
missCountUpdater =
-      
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapStringKey2.class,
-          "missCount");
-
+  
+  private static final 
AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryOffHeapStringKey2> 
hitCountUpdater 
+    = 
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapStringKey2.class,
 "hitCount");
+  private static final 
AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryOffHeapStringKey2> 
missCountUpdater 
+    = 
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapStringKey2.class,
 "missCount");
+  
   @Override
   public final long getLastAccessed() throws 
InternalStatisticsDisabledException {
     return this.lastAccessed;
   }
-
   private void setLastAccessed(long lastAccessed) {
     this.lastAccessed = lastAccessed;
   }
-
   @Override
   public final long getHitCount() throws InternalStatisticsDisabledException {
     return this.hitCount & 0xFFFFFFFFL;
   }
-
   @Override
   public final long getMissCount() throws InternalStatisticsDisabledException {
     return this.missCount & 0xFFFFFFFFL;
   }
-
   private void incrementHitCount() {
     hitCountUpdater.incrementAndGet(this);
   }
-
   private void incrementMissCount() {
     missCountUpdater.incrementAndGet(this);
   }
-
   @Override
   public final void resetCounts() throws InternalStatisticsDisabledException {
-    hitCountUpdater.set(this, 0);
-    missCountUpdater.set(this, 0);
+    hitCountUpdater.set(this,0);
+    missCountUpdater.set(this,0);
   }
 
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+  
   @Override
   public final void txDidDestroy(long currTime) {
     setLastModified(currTime);
@@ -335,31 +368,32 @@ public class VMStatsDiskRegionEntryOffHeapStringKey2 
extends VMStatsDiskRegionEn
     this.hitCount = 0;
     this.missCount = 0;
   }
-
   @Override
   public boolean hasStats() {
     return true;
   }
 
+  
+
+  
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+  
   // key code
+
   // strlen is encoded in lowest 6 bits (max strlen is 63)
   // character encoding info is in bits 7 and 8
   // The other bits are used to encoded character data.
   private final long bits1;
   // bits2 encodes character data
   private final long bits2;
-
   private int getKeyLength() {
     return (int) (this.bits1 & 0x003fL);
   }
-
   private int getEncoding() {
     // 0 means encoded as char
     // 1 means encoded as bytes that are all <= 0x7f;
     return (int) (this.bits1 >> 6) & 0x03;
   }
-
   @Override
   public final Object getKey() {
     int keylen = getKeyLength();
@@ -367,7 +401,7 @@ public class VMStatsDiskRegionEntryOffHeapStringKey2 
extends VMStatsDiskRegionEn
     long tmpBits1 = this.bits1;
     long tmpBits2 = this.bits2;
     if (getEncoding() == 1) {
-      for (int i = 0; i < keylen; i++) {
+      for (int i=0; i < keylen; i++) {
         if (i < 7) {
           tmpBits1 >>= 8;
           chars[i] = (char) (tmpBits1 & 0x00ff);
@@ -377,10 +411,10 @@ public class VMStatsDiskRegionEntryOffHeapStringKey2 
extends VMStatsDiskRegionEn
         }
       }
     } else {
-      for (int i = 0; i < keylen; i++) {
+      for (int i=0; i < keylen; i++) {
         if (i < 3) {
           tmpBits1 >>= 16;
-          chars[i] = (char) (tmpBits1 & 0x00FFff);
+        chars[i] = (char) (tmpBits1 & 0x00FFff);
         } else {
           chars[i] = (char) (tmpBits2 & 0x00FFff);
           tmpBits2 >>= 16;
@@ -391,16 +425,17 @@ public class VMStatsDiskRegionEntryOffHeapStringKey2 
extends VMStatsDiskRegionEn
   }
 
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+  
   @Override
   public boolean isKeyEqual(Object k) {
     if (k instanceof String) {
-      String str = (String) k;
+      String str = (String)k;
       int keylen = getKeyLength();
       if (str.length() == keylen) {
         long tmpBits1 = this.bits1;
         long tmpBits2 = this.bits2;
         if (getEncoding() == 1) {
-          for (int i = 0; i < keylen; i++) {
+          for (int i=0; i < keylen; i++) {
             char c;
             if (i < 7) {
               tmpBits1 >>= 8;
@@ -414,7 +449,7 @@ public class VMStatsDiskRegionEntryOffHeapStringKey2 
extends VMStatsDiskRegionEn
             }
           }
         } else {
-          for (int i = 0; i < keylen; i++) {
+          for (int i=0; i < keylen; i++) {
             char c;
             if (i < 3) {
               tmpBits1 >>= 16;
@@ -433,5 +468,7 @@ public class VMStatsDiskRegionEntryOffHeapStringKey2 
extends VMStatsDiskRegionEn
     }
     return false;
   }
+
   // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
 }
+

Reply via email to