diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/ChronicleStampedLock.pptx b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/ChronicleStampedLock.pptx
new file mode 100644
index 000000000..c8ead2797
Binary files /dev/null and b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/ChronicleStampedLock.pptx differ
diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/ChronicleStampedLock=WANTED.png b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/ChronicleStampedLock=WANTED.png
index e190e3531..bf163925d 100644
Binary files a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/ChronicleStampedLock=WANTED.png and b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/ChronicleStampedLock=WANTED.png differ
diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/revelations/ChronicleStampedLock.java b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/revelations/ChronicleStampedLock.java
index 3304d3929..8749e4631 100644
--- a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/revelations/ChronicleStampedLock.java
+++ b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/revelations/ChronicleStampedLock.java
@@ -1,6 +1,19 @@
package net.openhft.chronicle.map.fromdocs.acid.revelations;
+import net.openhft.chronicle.map.ChronicleMap;
+import net.openhft.chronicle.map.fromdocs.BondVOInterface;
+
+
+import java.io.IOException;
import java.util.concurrent.locks.StampedLock;
+import static net.openhft.chronicle.values.Values.newNativeReference;
+
+/**
+ * ben.cotton@rutgers.edu
+ *
+ * A totally hacked impl, awaiting OpenHFT's official ChronicleStampedLock API
+ */
public class ChronicleStampedLock extends StampedLock {
+
}
diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/revelations/DirtyReadOffender.java b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/revelations/DirtyReadOffender.java
index 827d9a1cf..a434a4afd 100644
--- a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/revelations/DirtyReadOffender.java
+++ b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/revelations/DirtyReadOffender.java
@@ -17,6 +17,7 @@ public class DirtyReadOffender {
try {
String isoLevel = args[0];
+ long sleepMock = Long.parseLong(args[1]);
ChronicleMap chm =
DirtyReadTolerance.offHeap(
@@ -27,12 +28,14 @@ public class DirtyReadOffender {
" DirtyReadOffender established chm "
);
BondVOInterface bond = newNativeReference(BondVOInterface.class);
+ BondVOInterface cslMock = newNativeReference(BondVOInterface.class);
chm.acquireUsing("369604101", bond);
+ chm.acquireUsing("Offender ", cslMock); // mock ChronicleStampLock
System.out.println(
" @t=" + System.currentTimeMillis() +
- " DirtyReadOffender sleeping 10 seconds "
+ " DirtyReadOffender sleeping "+sleepMock+" seconds "
);
- Thread.sleep(10 * 1_000);
+ Thread.sleep(sleepMock * 1_000);
System.out.println(
" @t=" + System.currentTimeMillis() +
" DirtyReadOffender awakening "
@@ -51,7 +54,7 @@ public class DirtyReadOffender {
" DirtyReadOffender ACQUIRING offHeapLock.writeLock();"
);
ChronicleStampedLock offHeapLock = new ChronicleStampedLock();
- while ((stamp = offHeapLock.writeLock()) == 0) {
+ while ((stamp = offHeapLock.tryWriteLock()) == 0) {
;
}
System.out.println(
@@ -67,6 +70,8 @@ public class DirtyReadOffender {
);
bond.setCoupon(newCoupon);
chm.put("369604101", bond);
+ cslMock.setEntryLockState(System.currentTimeMillis()); //mock'd
+ chm.put("Offender ",cslMock); //mock'd
System.out.println(
" @t=" + System.currentTimeMillis() +
" DirtyReadOffender coupon=["+
diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/revelations/DirtyReadVictim.java b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/revelations/DirtyReadVictim.java
index dd4f1cc48..5cbc278f5 100644
--- a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/revelations/DirtyReadVictim.java
+++ b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/revelations/DirtyReadVictim.java
@@ -9,6 +9,9 @@ public class DirtyReadVictim {
public static void main(String args[]) {
try {
+ String isoLevel = args[0];
+ long sleepMock = Long.parseLong(args[1]);
+
/**
* ben.cotton@rutgers.edu START
*/
@@ -18,6 +21,7 @@ public class DirtyReadVictim {
);
Double coupon = 0.00;
BondVOInterface bond = newNativeReference(BondVOInterface.class);
+ BondVOInterface cslMock = newNativeReference(BondVOInterface.class); //mock'd
long stamp = 0;
System.out.println(
" ,,@t=" + System.currentTimeMillis() +
@@ -33,6 +37,7 @@ public class DirtyReadVictim {
);
try {
chm.acquireUsing("369604101", bond);
+ chm.acquireUsing("Offender ", cslMock); //mock'd
System.out.println(
" ,,@t=" + System.currentTimeMillis() +
" DirtyReadVictim calling chm.get('369604101').getCoupon()"
@@ -45,15 +50,20 @@ public class DirtyReadVictim {
);
System.out.println(
" ,,@t=" + System.currentTimeMillis() +
- " DirtyReadVictim sleeping 60 seconds"
+ " DirtyReadVictim sleeping "+sleepMock+" seconds"
);
- Thread.sleep(60_000);
+ cslMock.setEntryLockState(0);
+ chm.put("Offender ", cslMock); //mock'd
+ Thread.sleep(sleepMock * 1_000);
System.out.println(
" ,,@t=" + System.currentTimeMillis() +
" DirtyReadVictim awakening"
);
+ //cslMock = (BondVOInterface) chm.get("Offender "); //mock'd
+ cslMock = (BondVOInterface) chm.get("Offender "); //mock'd
+
} finally {
- if (offHeapLock.validate(stamp)) {
+ if (offHeapLock.validate(stamp) && (cslMock.getEntryLockState() == 0)) {
System.out.println(
" ,,@t=" + System.currentTimeMillis() +
" DirtyReadVictim OPTIMISTICALLY_READ coupon=" +