From 0bcf774a14014bbed406a96d99f39ae0735ab8c5 Mon Sep 17 00:00:00 2001 From: Peter Lawrey Date: Fri, 25 Sep 2020 16:22:33 +0100 Subject: [PATCH] Use OS.getTarget() instead of TARGET, make private once all libraries have been released. --- .../map/locks/DirtyReadIntolerant_ReaderReader_Test.java | 4 ++-- .../chronicle/map/locks/DirtyReadOffenderIPCTest.java | 4 ++-- .../chronicle/map/locks/DirtyReadOffenderTest.java | 4 ++-- .../map/locks/DirtyReadOffender_ReaderWriterTest.java | 4 ++-- .../map/locks/DirtyReadOffender_WriterReaderTest.java | 4 ++-- .../map/locks/DirtyReadOffender_WriterWriterTest.java | 4 ++-- .../chronicle/map/locks/DirtyReadVictimIPCTest.java | 8 ++++---- .../openhft/chronicle/map/locks/DirtyReadVictimTest.java | 8 ++++---- .../java/net/openhft/chronicle/map/locks/ReaderToo.java | 4 ++-- .../java/net/openhft/chronicle/map/locks/WriterToo.java | 4 ++-- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/test/java/net/openhft/chronicle/map/locks/DirtyReadIntolerant_ReaderReader_Test.java b/src/test/java/net/openhft/chronicle/map/locks/DirtyReadIntolerant_ReaderReader_Test.java index b78f5007a..70ad24637 100644 --- a/src/test/java/net/openhft/chronicle/map/locks/DirtyReadIntolerant_ReaderReader_Test.java +++ b/src/test/java/net/openhft/chronicle/map/locks/DirtyReadIntolerant_ReaderReader_Test.java @@ -25,7 +25,7 @@ public class DirtyReadIntolerant_ReaderReader_Test { ChronicleMap chm = DirtyReadTolerance.offHeap( - OS.TARGET + "/shm-OPERAND_CHRONICLE_MAP" + OS.getTarget() + "/shm-OPERAND_CHRONICLE_MAP" ); Double coupon = 0.00; BondVOInterface bond = newNativeReference(BondVOInterface.class); @@ -38,7 +38,7 @@ public class DirtyReadIntolerant_ReaderReader_Test { ); ChronicleStampedLock offHeapLock = new ChronicleStampedLock( - OS.TARGET + "/shm-" + OS.getTarget() + "/shm-" + "OPERAND_ChronicleStampedLock" ); System.out.println( diff --git a/src/test/java/net/openhft/chronicle/map/locks/DirtyReadOffenderIPCTest.java b/src/test/java/net/openhft/chronicle/map/locks/DirtyReadOffenderIPCTest.java index c90f3d493..af4c29c7f 100644 --- a/src/test/java/net/openhft/chronicle/map/locks/DirtyReadOffenderIPCTest.java +++ b/src/test/java/net/openhft/chronicle/map/locks/DirtyReadOffenderIPCTest.java @@ -28,7 +28,7 @@ public class DirtyReadOffenderIPCTest implements Runnable { ChronicleMap chm = DirtyReadTolerance.offHeap( - OS.TARGET + "/shm-" + OS.getTarget() + "/shm-" + "OPERAND_CHRONICLE_MAP" ); System.out.println( @@ -36,7 +36,7 @@ public class DirtyReadOffenderIPCTest implements Runnable { " DirtyReadOffender established chm " ); StampedLock offHeapLock = new ChronicleStampedLock( - OS.TARGET + "/shm-" + OS.getTarget() + "/shm-" + "OPERAND_ChronicleStampedLock" ); BondVOInterface bond = newNativeReference(BondVOInterface.class); diff --git a/src/test/java/net/openhft/chronicle/map/locks/DirtyReadOffenderTest.java b/src/test/java/net/openhft/chronicle/map/locks/DirtyReadOffenderTest.java index 9876020f0..45461d996 100644 --- a/src/test/java/net/openhft/chronicle/map/locks/DirtyReadOffenderTest.java +++ b/src/test/java/net/openhft/chronicle/map/locks/DirtyReadOffenderTest.java @@ -17,7 +17,7 @@ class DirtyReadOffenderTest implements Runnable { ChronicleMap chm = DirtyReadTolerance.offHeap( - OS.TARGET + "/shm-" + OS.getTarget() + "/shm-" + "OPERAND_CHRONICLE_MAP" ); System.out.println( @@ -25,7 +25,7 @@ class DirtyReadOffenderTest implements Runnable { " DirtyReadOffender established chm " ); StampedLock offHeapLock = new ChronicleStampedLock( - OS.TARGET + "/shm-" + OS.getTarget() + "/shm-" + "OPERAND_ChronicleStampedLock" ); BondVOInterface bond = newNativeReference(BondVOInterface.class); diff --git a/src/test/java/net/openhft/chronicle/map/locks/DirtyReadOffender_ReaderWriterTest.java b/src/test/java/net/openhft/chronicle/map/locks/DirtyReadOffender_ReaderWriterTest.java index 19d51bed5..e81003a75 100644 --- a/src/test/java/net/openhft/chronicle/map/locks/DirtyReadOffender_ReaderWriterTest.java +++ b/src/test/java/net/openhft/chronicle/map/locks/DirtyReadOffender_ReaderWriterTest.java @@ -30,7 +30,7 @@ public class DirtyReadOffender_ReaderWriterTest { ChronicleMap chm = DirtyReadTolerance.offHeap( - OS.TARGET + "/shm-" + + OS.getTarget() + "/shm-" + "OPERAND_CHRONICLE_MAP" ); System.out.println( @@ -39,7 +39,7 @@ public class DirtyReadOffender_ReaderWriterTest { " DirtyReadOffender established chm " ); ChronicleStampedLock offHeapLock = new ChronicleStampedLock( - OS.TARGET + "/shm-" + OS.getTarget() + "/shm-" + "OPERAND_ChronicleStampedLock" ); Assert.assertNotEquals(offHeapLock, null); diff --git a/src/test/java/net/openhft/chronicle/map/locks/DirtyReadOffender_WriterReaderTest.java b/src/test/java/net/openhft/chronicle/map/locks/DirtyReadOffender_WriterReaderTest.java index 0981ee85e..fac3f6ccd 100644 --- a/src/test/java/net/openhft/chronicle/map/locks/DirtyReadOffender_WriterReaderTest.java +++ b/src/test/java/net/openhft/chronicle/map/locks/DirtyReadOffender_WriterReaderTest.java @@ -30,7 +30,7 @@ public class DirtyReadOffender_WriterReaderTest { ChronicleMap chm = DirtyReadTolerance.offHeap( - OS.TARGET + "/shm-" + + OS.getTarget() + "/shm-" + "OPERAND_CHRONICLE_MAP" ); System.out.println( @@ -39,7 +39,7 @@ public class DirtyReadOffender_WriterReaderTest { " DirtyReadOffender established chm " ); ChronicleStampedLock offHeapLock = new ChronicleStampedLock( - OS.TARGET + "/shm-" + OS.getTarget() + "/shm-" + "OPERAND_ChronicleStampedLock" ); Assert.assertNotEquals(offHeapLock, null); diff --git a/src/test/java/net/openhft/chronicle/map/locks/DirtyReadOffender_WriterWriterTest.java b/src/test/java/net/openhft/chronicle/map/locks/DirtyReadOffender_WriterWriterTest.java index 1b5433c4e..b2caddf55 100644 --- a/src/test/java/net/openhft/chronicle/map/locks/DirtyReadOffender_WriterWriterTest.java +++ b/src/test/java/net/openhft/chronicle/map/locks/DirtyReadOffender_WriterWriterTest.java @@ -30,7 +30,7 @@ public class DirtyReadOffender_WriterWriterTest { ChronicleMap chm = DirtyReadTolerance.offHeap( - OS.TARGET + "/shm-" + + OS.getTarget() + "/shm-" + "OPERAND_CHRONICLE_MAP" ); System.out.println( @@ -39,7 +39,7 @@ public class DirtyReadOffender_WriterWriterTest { " DirtyReadOffender established chm " ); ChronicleStampedLock offHeapLock = new ChronicleStampedLock( - OS.TARGET + "/shm-" + OS.getTarget() + "/shm-" + "OPERAND_ChronicleStampedLock" ); Assert.assertNotEquals(offHeapLock, null); diff --git a/src/test/java/net/openhft/chronicle/map/locks/DirtyReadVictimIPCTest.java b/src/test/java/net/openhft/chronicle/map/locks/DirtyReadVictimIPCTest.java index 10586405f..35f02ad62 100644 --- a/src/test/java/net/openhft/chronicle/map/locks/DirtyReadVictimIPCTest.java +++ b/src/test/java/net/openhft/chronicle/map/locks/DirtyReadVictimIPCTest.java @@ -72,7 +72,7 @@ public class DirtyReadVictimIPCTest { ChronicleMap chm = DirtyReadTolerance.offHeap( - OS.TARGET + "/shm-OPERAND_CHRONICLE_MAP" + OS.getTarget() + "/shm-OPERAND_CHRONICLE_MAP" ); Double coupon = 0.00; BondVOInterface bond = newNativeReference(BondVOInterface.class); @@ -82,7 +82,7 @@ public class DirtyReadVictimIPCTest { " DirtyReadVictim CALLING offHeapLock.tryOptimisticRead()" ); ChronicleStampedLock offHeapLock = new ChronicleStampedLock( - OS.TARGET + "/shm-" + + OS.getTarget() + "/shm-" + "OPERAND_ChronicleStampedLock" ); while ((stamp = offHeapLock.tryOptimisticRead()) == 0) { @@ -167,7 +167,7 @@ public class DirtyReadVictimIPCTest { */ ChronicleMap chm = DirtyReadTolerance.offHeap( - OS.TARGET + "/shm-OPERAND_CHRONICLE_MAP" + OS.getTarget() + "/shm-OPERAND_CHRONICLE_MAP" ); Double coupon = 0.00; BondVOInterface bond = newNativeReference(BondVOInterface.class); @@ -177,7 +177,7 @@ public class DirtyReadVictimIPCTest { " DirtyReadVictim CALLING offHeapLock.tryOptimisticRead()" ); ChronicleStampedLock offHeapLock = new ChronicleStampedLock( - OS.TARGET + "/shm-" + OS.getTarget() + "/shm-" + "OPERAND_ChronicleStampedLock" ); while ((stamp = offHeapLock.tryOptimisticRead()) == 0) { diff --git a/src/test/java/net/openhft/chronicle/map/locks/DirtyReadVictimTest.java b/src/test/java/net/openhft/chronicle/map/locks/DirtyReadVictimTest.java index 4c9cf7eae..1512c229e 100644 --- a/src/test/java/net/openhft/chronicle/map/locks/DirtyReadVictimTest.java +++ b/src/test/java/net/openhft/chronicle/map/locks/DirtyReadVictimTest.java @@ -32,7 +32,7 @@ public class DirtyReadVictimTest { ChronicleMap chm = DirtyReadTolerance.offHeap( - OS.TARGET + "/shm-OPERAND_CHRONICLE_MAP" + OS.getTarget() + "/shm-OPERAND_CHRONICLE_MAP" ); Double coupon = 0.00; BondVOInterface bond = newNativeReference(BondVOInterface.class); @@ -42,7 +42,7 @@ public class DirtyReadVictimTest { " DirtyReadVictim CALLING offHeapLock.tryOptimisticRead()" ); ChronicleStampedLock offHeapLock = new ChronicleStampedLock( - OS.TARGET + "/shm-" + + OS.getTarget() + "/shm-" + "OPERAND_ChronicleStampedLock" ); while ((stamp = offHeapLock.tryOptimisticRead()) == 0) { @@ -128,7 +128,7 @@ public class DirtyReadVictimTest { */ ChronicleMap chm = DirtyReadTolerance.offHeap( - OS.TARGET + "/shm-OPERAND_CHRONICLE_MAP" + OS.getTarget() + "/shm-OPERAND_CHRONICLE_MAP" ); Double coupon = 0.00; BondVOInterface bond = newNativeReference(BondVOInterface.class); @@ -138,7 +138,7 @@ public class DirtyReadVictimTest { " DirtyReadVictim CALLING offHeapLock.tryOptimisticRead()" ); ChronicleStampedLock offHeapLock = new ChronicleStampedLock( - OS.TARGET + "/shm-" + OS.getTarget() + "/shm-" + "OPERAND_ChronicleStampedLock" ); while ((stamp = offHeapLock.tryOptimisticRead()) == 0) { diff --git a/src/test/java/net/openhft/chronicle/map/locks/ReaderToo.java b/src/test/java/net/openhft/chronicle/map/locks/ReaderToo.java index 703553d77..ee6d0628f 100644 --- a/src/test/java/net/openhft/chronicle/map/locks/ReaderToo.java +++ b/src/test/java/net/openhft/chronicle/map/locks/ReaderToo.java @@ -18,7 +18,7 @@ class ReaderToo implements Runnable { */ ChronicleMap chm = DirtyReadTolerance.offHeap( - OS.TARGET + "/shm-OPERAND_CHRONICLE_MAP" + OS.getTarget() + "/shm-OPERAND_CHRONICLE_MAP" ); Double coupon = 0.00; BondVOInterface bond = newNativeReference(BondVOInterface.class); @@ -31,7 +31,7 @@ class ReaderToo implements Runnable { ); ChronicleStampedLock offHeapLock = new ChronicleStampedLock( - OS.TARGET + "/shm-" + OS.getTarget() + "/shm-" + "OPERAND_ChronicleStampedLock" ); System.out.println( diff --git a/src/test/java/net/openhft/chronicle/map/locks/WriterToo.java b/src/test/java/net/openhft/chronicle/map/locks/WriterToo.java index e6a1b508d..781d16d4c 100644 --- a/src/test/java/net/openhft/chronicle/map/locks/WriterToo.java +++ b/src/test/java/net/openhft/chronicle/map/locks/WriterToo.java @@ -16,7 +16,7 @@ class WriterToo implements Runnable { ChronicleMap chm = DirtyReadTolerance.offHeap( - OS.TARGET + "/shm-" + + OS.getTarget() + "/shm-" + "OPERAND_CHRONICLE_MAP" ); System.out.println( @@ -25,7 +25,7 @@ class WriterToo implements Runnable { " DirtyReadOffender established chm " ); ChronicleStampedLock offHeapLock = new ChronicleStampedLock( - OS.TARGET + "/shm-" + OS.getTarget() + "/shm-" + "OPERAND_ChronicleStampedLock" ); Assert.assertNotEquals(offHeapLock, null);