Repository: kafka Updated Branches: refs/heads/trunk bfbd3acbf -> 5397d3c53
kafka-2113; TestPurgatoryPerformance does not compile using IBM JDK; patched by Rajini Sivaram; reviewed by Yasuhiro Matsuda and Jun Rao Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/5397d3c5 Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/5397d3c5 Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/5397d3c5 Branch: refs/heads/trunk Commit: 5397d3c53e028a745f9d6dbfe8fc84c859656de0 Parents: bfbd3ac Author: Rajini Sivaram <rajinisiva...@googlemail.com> Authored: Thu Apr 16 10:26:49 2015 -0700 Committer: Jun Rao <jun...@gmail.com> Committed: Thu Apr 16 10:26:49 2015 -0700 ---------------------------------------------------------------------- .../other/kafka/TestPurgatoryPerformance.scala | 24 ++++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kafka/blob/5397d3c5/core/src/test/scala/other/kafka/TestPurgatoryPerformance.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/other/kafka/TestPurgatoryPerformance.scala b/core/src/test/scala/other/kafka/TestPurgatoryPerformance.scala index 962253a..39d6d8a 100644 --- a/core/src/test/scala/other/kafka/TestPurgatoryPerformance.scala +++ b/core/src/test/scala/other/kafka/TestPurgatoryPerformance.scala @@ -18,6 +18,7 @@ package kafka import java.lang.management.ManagementFactory +import java.lang.management.OperatingSystemMXBean import java.util.Random import java.util.concurrent._ @@ -84,11 +85,7 @@ object TestPurgatoryPerformance { val verbose = options.valueOf(verboseOpt).booleanValue val gcMXBeans = ManagementFactory.getGarbageCollectorMXBeans().sortBy(_.getName) - val osMXBean = try { - Some(ManagementFactory.getOperatingSystemMXBean().asInstanceOf[com.sun.management.OperatingSystemMXBean]) - } catch { - case _: Throwable => None - } + val osMXBean = ManagementFactory.getOperatingSystemMXBean val latencySamples = new LatencySamples(1000000, pct75, pct50) val intervalSamples = new IntervalSamples(1000000, requestRate) @@ -97,7 +94,7 @@ object TestPurgatoryPerformance { val gcNames = gcMXBeans.map(_.getName) - val initialCpuTimeNano = osMXBean.map(x => x.getProcessCpuTime) + val initialCpuTimeNano = getProcessCpuTimeNanos(osMXBean) val latch = new CountDownLatch(numRequests) val start = System.currentTimeMillis val keys = (0 until numKeys).map(i => "fakeKey%d".format(i)) @@ -142,7 +139,7 @@ object TestPurgatoryPerformance { val targetRate = numRequests.toDouble * 1000d / (requestArrivalTime - start).toDouble val actualRate = numRequests.toDouble * 1000d / (end - start).toDouble - val cpuTime = osMXBean.map(x => (x.getProcessCpuTime - initialCpuTimeNano.get) / 1000000L) + val cpuTime = getProcessCpuTimeNanos(osMXBean).map(x => (x - initialCpuTimeNano.get) / 1000000L) val gcCounts = gcMXBeans.map(_.getCollectionCount) val gcTimes = gcMXBeans.map(_.getCollectionTime) @@ -151,6 +148,19 @@ object TestPurgatoryPerformance { purgatory.shutdown() } + // Use JRE-specific class to get process CPU time + private def getProcessCpuTimeNanos(osMXBean : OperatingSystemMXBean) = { + try { + Some(Class.forName("com.sun.management.OperatingSystemMXBean").getMethod("getProcessCpuTime").invoke(osMXBean).asInstanceOf[Long]) + } catch { + case _: Throwable => try { + Some(Class.forName("com.ibm.lang.management.OperatingSystemMXBean").getMethod("getProcessCpuTimeByNS").invoke(osMXBean).asInstanceOf[Long]) + } catch { + case _: Throwable => None + } + } + } + // log-normal distribution (http://en.wikipedia.org/wiki/Log-normal_distribution) // mu: the mean of the underlying normal distribution (not the mean of this log-normal distribution) // sigma: the standard deviation of the underlying normal distribution (not the stdev of this log-normal distribution)
