From ffff33bed1ada0450f3ed3ce492d5de8bab16cb4 Mon Sep 17 00:00:00 2001 From: Peter Lawrey Date: Tue, 12 Apr 2016 12:08:14 +0100 Subject: [PATCH] Reduce Thread.sleep to Jvm.pause, delays >= 1s to 500 ms, and remove "throws Exception" from tests --- .../java/net/openhft/chronicle/map/ChronicleMapBuilder.java | 2 +- .../java/net/openhft/chronicle/map/CHMLatencyTestMain.java | 2 +- src/test/java/net/openhft/chronicle/map/CHMTest5.java | 2 +- .../java/net/openhft/chronicle/map/CHMUseCasesTest.java | 2 +- .../openhft/chronicle/map/ChronicleMapSanityCheckTest.java | 2 +- .../net/openhft/chronicle/map/Issue62ChronicleClient.java | 2 +- .../net/openhft/chronicle/map/Issue62ChronicleServer.java | 2 +- src/test/java/net/openhft/chronicle/map/Issue63Test.java | 6 +++--- .../java/net/openhft/chronicle/map/LargeEntriesTest.java | 2 +- .../openhft/chronicle/map/ProcessInstanceLimiterMain.java | 4 ++-- .../net/openhft/chronicle/map/ReplicationCheckingMap.java | 2 +- .../chronicle/map/example/PointListSerializationTest.java | 2 +- .../net/openhft/chronicle/map/jsr166/JSR166TestCase.java | 2 +- .../java/net/openhft/chronicle/map/jsr166/map/MapCheck.java | 2 +- .../chronicle/map/utility/ProcessInstanceLimiter.java | 6 +++--- src/test/java/net/openhft/chronicle/set/Builder.java | 4 ++-- 16 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java b/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java index c29f3297d..6354d9118 100755 --- a/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java +++ b/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java @@ -1501,7 +1501,7 @@ public final class ChronicleMapBuilder implements // truncated between length() and read() calls, then continue to wait } try { - Thread.sleep(100); + Jvm.pause(100); } catch (InterruptedException e) { if (recover) { break; diff --git a/src/test/java/net/openhft/chronicle/map/CHMLatencyTestMain.java b/src/test/java/net/openhft/chronicle/map/CHMLatencyTestMain.java index f169d9bac..a52653577 100755 --- a/src/test/java/net/openhft/chronicle/map/CHMLatencyTestMain.java +++ b/src/test/java/net/openhft/chronicle/map/CHMLatencyTestMain.java @@ -144,7 +144,7 @@ public class CHMLatencyTestMain { public void run() { while (running) { try { - Thread.sleep(1); + Jvm.pause(1); } catch (InterruptedException e) { e.printStackTrace(); break; diff --git a/src/test/java/net/openhft/chronicle/map/CHMTest5.java b/src/test/java/net/openhft/chronicle/map/CHMTest5.java index 58f377c1f..d17a24237 100644 --- a/src/test/java/net/openhft/chronicle/map/CHMTest5.java +++ b/src/test/java/net/openhft/chronicle/map/CHMTest5.java @@ -233,7 +233,7 @@ public class CHMTest5 { long elapsedTime; while ((elapsedTime = System.currentTimeMillis() - start) < pause) { try { - Thread.sleep(pause - elapsedTime); + Jvm.pause(pause - elapsedTime); } catch (InterruptedException e) { } } diff --git a/src/test/java/net/openhft/chronicle/map/CHMUseCasesTest.java b/src/test/java/net/openhft/chronicle/map/CHMUseCasesTest.java index cb1b9dd35..8279de769 100644 --- a/src/test/java/net/openhft/chronicle/map/CHMUseCasesTest.java +++ b/src/test/java/net/openhft/chronicle/map/CHMUseCasesTest.java @@ -115,7 +115,7 @@ public class CHMUseCasesTest { if (map1.equals(map2)) break; try { - Thread.sleep(1); + Jvm.pause(1); } catch (InterruptedException e) { throw new RuntimeException(e); } diff --git a/src/test/java/net/openhft/chronicle/map/ChronicleMapSanityCheckTest.java b/src/test/java/net/openhft/chronicle/map/ChronicleMapSanityCheckTest.java index 84a7500af..6339b343e 100644 --- a/src/test/java/net/openhft/chronicle/map/ChronicleMapSanityCheckTest.java +++ b/src/test/java/net/openhft/chronicle/map/ChronicleMapSanityCheckTest.java @@ -107,7 +107,7 @@ public class ChronicleMapSanityCheckTest { }, 0, consumerPeriod, consumerTimeUnit); - Thread.sleep(totalTestTimeMS); + Jvm.pause(totalTestTimeMS); consumerExecutor.shutdown(); try { diff --git a/src/test/java/net/openhft/chronicle/map/Issue62ChronicleClient.java b/src/test/java/net/openhft/chronicle/map/Issue62ChronicleClient.java index 300c820b4..a5abd1be6 100644 --- a/src/test/java/net/openhft/chronicle/map/Issue62ChronicleClient.java +++ b/src/test/java/net/openhft/chronicle/map/Issue62ChronicleClient.java @@ -45,7 +45,7 @@ public class Issue62ChronicleClient { cityPostalCodesMapBuilder.createPersistedTo(MAP_FILE_B)) { LOGGER.info("Starting"); - Thread.sleep(3000); + Jvm.pause(3000); for (Entry entry : map.entrySet()) { LOGGER.info("{} : {}", entry.getKey(), entry.getValue()); diff --git a/src/test/java/net/openhft/chronicle/map/Issue62ChronicleServer.java b/src/test/java/net/openhft/chronicle/map/Issue62ChronicleServer.java index 9fada2820..bf8818bd9 100644 --- a/src/test/java/net/openhft/chronicle/map/Issue62ChronicleServer.java +++ b/src/test/java/net/openhft/chronicle/map/Issue62ChronicleServer.java @@ -63,7 +63,7 @@ public class Issue62ChronicleServer { } LOGGER.info("Map created"); - Thread.sleep(15000); + Jvm.pause(15000); } diff --git a/src/test/java/net/openhft/chronicle/map/Issue63Test.java b/src/test/java/net/openhft/chronicle/map/Issue63Test.java index 3c890b2b6..4fbad3478 100644 --- a/src/test/java/net/openhft/chronicle/map/Issue63Test.java +++ b/src/test/java/net/openhft/chronicle/map/Issue63Test.java @@ -39,7 +39,7 @@ import static org.junit.Assert.assertEquals; public class Issue63Test { @Test - public void issue63Test() throws Exception { + public void issue63test() { Path path = Paths.get(System.getProperty("java.io.tmpdir") + "/test-vectors1.dat"); if (Files.exists(path)) Files.delete(path); File mapFile = path.toFile(); @@ -148,7 +148,7 @@ public class Issue63Test { new Issue63Test().testChronicleMap(); } - void testChronicleMap() throws Exception { + void testChronicleMap() { int num = 1_000_000; testChronicleMap(System.getProperty("java.io.tmpdir"), num, num); ThreadLocalRandom random = ThreadLocalRandom.current(); @@ -307,7 +307,7 @@ public class Issue63Test { } @Test - public void testKnownItems() throws Exception { + public void testKnownItems() { ArrayList averageKnownItems = new ArrayList<>(); for (int i = 0; i < 100; i++) { diff --git a/src/test/java/net/openhft/chronicle/map/LargeEntriesTest.java b/src/test/java/net/openhft/chronicle/map/LargeEntriesTest.java index 3d7bfeaa9..9afa0c4b4 100755 --- a/src/test/java/net/openhft/chronicle/map/LargeEntriesTest.java +++ b/src/test/java/net/openhft/chronicle/map/LargeEntriesTest.java @@ -157,7 +157,7 @@ public class LargeEntriesTest { sb.append(thisThread).append("\n"); try { while (!Thread.currentThread().isInterrupted()) { - Thread.sleep(50); + Jvm.pause(50); StackTraceElement[] stackTrace = thisThread.getStackTrace(); for (int i = 0; i < 4 && i < stackTrace.length; i++) sb.append("\tat ").append(stackTrace[i]).append("\n"); diff --git a/src/test/java/net/openhft/chronicle/map/ProcessInstanceLimiterMain.java b/src/test/java/net/openhft/chronicle/map/ProcessInstanceLimiterMain.java index 77e80b9b1..6977e8f8b 100644 --- a/src/test/java/net/openhft/chronicle/map/ProcessInstanceLimiterMain.java +++ b/src/test/java/net/openhft/chronicle/map/ProcessInstanceLimiterMain.java @@ -60,7 +60,7 @@ public class ProcessInstanceLimiterMain implements Runnable { ProcessInstanceLimiterMain limiter = new ProcessInstanceLimiterMain("test", callback); limiter.setMaxNumberOfProcessesOfType("x", 2); limiter.startingProcessOfType("x"); - Thread.sleep(60L * 1000L); + Jvm.pause(60L * 1000L); } public static void pause(long pause) { @@ -68,7 +68,7 @@ public class ProcessInstanceLimiterMain implements Runnable { long elapsedTime; while ((elapsedTime = System.currentTimeMillis() - start) < pause) { try { - Thread.sleep(pause - elapsedTime); + Jvm.pause(pause - elapsedTime); } catch (InterruptedException e) { } } diff --git a/src/test/java/net/openhft/chronicle/map/ReplicationCheckingMap.java b/src/test/java/net/openhft/chronicle/map/ReplicationCheckingMap.java index dadfe9211..3642e8f2d 100644 --- a/src/test/java/net/openhft/chronicle/map/ReplicationCheckingMap.java +++ b/src/test/java/net/openhft/chronicle/map/ReplicationCheckingMap.java @@ -92,7 +92,7 @@ public class ReplicationCheckingMap implements ChronicleMap { if (i > 30) { try { - Thread.sleep(i); + Jvm.pause(i); } catch (InterruptedException e) { e.printStackTrace(); } diff --git a/src/test/java/net/openhft/chronicle/map/example/PointListSerializationTest.java b/src/test/java/net/openhft/chronicle/map/example/PointListSerializationTest.java index 2009b99e7..90c8d436d 100644 --- a/src/test/java/net/openhft/chronicle/map/example/PointListSerializationTest.java +++ b/src/test/java/net/openhft/chronicle/map/example/PointListSerializationTest.java @@ -101,7 +101,7 @@ public class PointListSerializationTest { } @Test - public void testComplexSerialization() throws Exception { + public void testComplexSerialization() { try (ChronicleMap map = ChronicleMapBuilder .of(String.class, A.class) .valueMarshaller(AMarshaller.INSTANCE) diff --git a/src/test/java/net/openhft/chronicle/map/jsr166/JSR166TestCase.java b/src/test/java/net/openhft/chronicle/map/jsr166/JSR166TestCase.java index 7538a8f11..38578a4b7 100644 --- a/src/test/java/net/openhft/chronicle/map/jsr166/JSR166TestCase.java +++ b/src/test/java/net/openhft/chronicle/map/jsr166/JSR166TestCase.java @@ -153,7 +153,7 @@ public class JSR166TestCase { long ns = millis * 1000 * 1000; for (; ; ) { if (millis > 0L) - Thread.sleep(millis); + Jvm.pause(millis); else // too short to sleep Thread.yield(); long d = ns - (System.nanoTime() - startTime); diff --git a/src/test/java/net/openhft/chronicle/map/jsr166/map/MapCheck.java b/src/test/java/net/openhft/chronicle/map/jsr166/map/MapCheck.java index f2c1855be..5c3068bbc 100644 --- a/src/test/java/net/openhft/chronicle/map/jsr166/map/MapCheck.java +++ b/src/test/java/net/openhft/chronicle/map/jsr166/map/MapCheck.java @@ -97,7 +97,7 @@ public class MapCheck { mainTest(key, absent); if ((rep & 3) == 3 && rep < numTests - 1) { shuffle(key); - // Thread.sleep(10); + // Jvm.pause(10); } } diff --git a/src/test/java/net/openhft/chronicle/map/utility/ProcessInstanceLimiter.java b/src/test/java/net/openhft/chronicle/map/utility/ProcessInstanceLimiter.java index 9de4a5bf8..7f6f3fe88 100644 --- a/src/test/java/net/openhft/chronicle/map/utility/ProcessInstanceLimiter.java +++ b/src/test/java/net/openhft/chronicle/map/utility/ProcessInstanceLimiter.java @@ -151,7 +151,7 @@ public class ProcessInstanceLimiter implements Runnable { public static void main(String[] args) throws IOException, InterruptedException { ProcessInstanceLimiter.limitTo(2); - Thread.sleep(60L * 1000L); + Jvm.pause(60L * 1000L); } /** @@ -224,7 +224,7 @@ public class ProcessInstanceLimiter implements Runnable { long elapsedTime; while ((elapsedTime = System.currentTimeMillis() - start) < pause) { try { - Thread.sleep(pause - elapsedTime); + Jvm.pause(pause - elapsedTime); } catch (InterruptedException e) { } } @@ -336,7 +336,7 @@ public class ProcessInstanceLimiter implements Runnable { this.callback.tooManyProcessesOfType(processType); return; } - //try {Thread.sleep(60L*1000L);} catch (InterruptedException e) {} + //try {Jvm.pause(60L*1000L);} catch (InterruptedException e) {} //we've got the lock, now copy the array try { for (int i = 0; i < times1.length; i++) { diff --git a/src/test/java/net/openhft/chronicle/set/Builder.java b/src/test/java/net/openhft/chronicle/set/Builder.java index dd52aec8d..96dbf546e 100644 --- a/src/test/java/net/openhft/chronicle/set/Builder.java +++ b/src/test/java/net/openhft/chronicle/set/Builder.java @@ -59,14 +59,14 @@ public class Builder { // not map1.equals(map2), the reason is described above if (map1.equals(map2)) { numberOfTimesTheSame++; - Thread.sleep(1); + Jvm.pause(1); if (numberOfTimesTheSame == 10) { System.out.println("same"); break; } } - Thread.sleep(1); + Jvm.pause(1); if (System.currentTimeMillis() - startTime > timeOutMs) break; }