diff --git a/artemis-cli/pom.xml b/artemis-cli/pom.xml index 960d16a2d1..fa386ef997 100644 --- a/artemis-cli/pom.xml +++ b/artemis-cli/pom.xml @@ -126,10 +126,6 @@ commons-lang3 ${commons.lang.version} - - org.hdrhistogram - HdrHistogram - com.sun.winsw winsw diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/util/SyncCalculation.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/util/SyncCalculation.java index c01506df40..5b5c9f4cc6 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/util/SyncCalculation.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/util/SyncCalculation.java @@ -24,7 +24,6 @@ import java.text.DecimalFormat; import java.util.Arrays; import java.util.concurrent.TimeUnit; -import org.HdrHistogram.Histogram; import org.apache.activemq.artemis.core.io.IOCallback; import org.apache.activemq.artemis.core.io.SequentialFile; import org.apache.activemq.artemis.core.io.SequentialFileFactory; @@ -80,7 +79,6 @@ public class SyncCalculation { SequentialFileFactory factory = newFactory(datafolder, fsync, journalType, blockSize * blocks, maxAIO); final boolean asyncWrites = journalType == JournalType.ASYNCIO && !syncWrites; //the write latencies could be taken only when writes are effectively synchronous - final Histogram writeLatencies = (verbose && !asyncWrites) ? new Histogram(MAX_FLUSH_NANOS, 2) : null; if (journalType == JournalType.ASYNCIO && syncWrites) { System.out.println(); @@ -94,9 +92,6 @@ public class SyncCalculation { if (verbose) { System.out.println("Using " + factory.getClass().getName() + " to calculate sync times, alignment=" + factory.getAlignment()); - if (writeLatencies == null) { - System.out.println("*** Use --sync-writes if you want to see a histogram for each write performed ***"); - } } SequentialFile file = factory.createSequentialFile(fileName); //to be sure that a process/thread crash won't leave the dataFolder with garbage files @@ -144,18 +139,11 @@ public class SyncCalculation { bufferBlock.position(0); latch.countUp(); long startWrite = 0; - if (writeLatencies != null) { - startWrite = System.nanoTime(); - } file.writeDirect(bufferBlock, true, callback); if (syncWrites) { flushLatch(latch); } - if (writeLatencies != null) { - final long elapsedWriteNanos = System.nanoTime() - startWrite; - writeLatencies.recordValue(elapsedWriteNanos); - } } if (!syncWrites) flushLatch(latch); @@ -173,29 +161,10 @@ public class SyncCalculation { } file.close(); - if (ntry == 0 && writeLatencies != null) { - writeLatencies.reset(); // discarding the first one.. some warmup time - } } factory.releaseDirectBuffer(bufferBlock); - if (writeLatencies != null) { - System.out.println("Write Latencies Percentile Distribution in microseconds"); - //print latencies in us -> (ns * 1000d) - - System.out.println("*****************************************************************"); - writeLatencies.outputPercentileDistribution(System.out, 1000d); - System.out.println(); - System.out.println("*****************************************************************"); - System.out.println("*** this may be useful to generate charts if you like charts: ***"); - System.out.println("*** http://hdrhistogram.github.io/HdrHistogram/plotFiles.html ***"); - System.out.println("*****************************************************************"); - System.out.println(); - - writeLatencies.reset(); - } - long totalTime = Long.MAX_VALUE; for (int i = 0; i < tries; i++) { if (result[i] < totalTime) { diff --git a/artemis-distribution/src/main/assembly/dep.xml b/artemis-distribution/src/main/assembly/dep.xml index 2f6999ad16..ead7396f35 100644 --- a/artemis-distribution/src/main/assembly/dep.xml +++ b/artemis-distribution/src/main/assembly/dep.xml @@ -99,7 +99,6 @@ org.jgroups:jgroups org.apache.geronimo.specs:geronimo-json_1.0_spec org.apache.johnzon:johnzon-core - org.hdrhistogram:HdrHistogram javax.xml.bind:jaxb-api com.sun.xml.bind:jaxb-impl com.sun.xml.bind:jaxb-core diff --git a/pom.xml b/pom.xml index beb9dcd57f..36e5c33f3a 100644 --- a/pom.xml +++ b/pom.xml @@ -82,7 +82,6 @@ 5.14.5 10.11.1.1 1.9.3 - 2.1.10 3.2.2 1.14 19.0 @@ -685,15 +684,6 @@ - - - - org.hdrhistogram - HdrHistogram - ${org.hdrhistogram.version} - - - xml-apis