From 0ad117a9255ccdbf26ce30222508070545579056 Mon Sep 17 00:00:00 2001 From: Diego Date: Thu, 8 Jun 2017 23:27:09 -0300 Subject: * Introduce Java 8 Unsafe intrinsics in LogAdder (lock addq and lock xchg) * Introduce atomic variant of LongAdder::sumThenReset -> LongAdder::sumAndReset * Remove LongMaxUpdater in favor to AtomicLongMaxUpdater --- kamon-core/src/main/scala/kamon/metric/MinMaxCounter.scala | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'kamon-core/src/main/scala/kamon/metric/MinMaxCounter.scala') diff --git a/kamon-core/src/main/scala/kamon/metric/MinMaxCounter.scala b/kamon-core/src/main/scala/kamon/metric/MinMaxCounter.scala index 211a1916..ae12f635 100644 --- a/kamon-core/src/main/scala/kamon/metric/MinMaxCounter.scala +++ b/kamon-core/src/main/scala/kamon/metric/MinMaxCounter.scala @@ -18,8 +18,7 @@ package kamon.metric import java.lang.Math.abs import java.util.concurrent.atomic.AtomicLong -import kamon.jsr166.LongMaxUpdater -import kamon.util.MeasurementUnit +import kamon.util.{AtomicLongMaxUpdater, MeasurementUnit} import scala.concurrent.duration.Duration @@ -35,12 +34,11 @@ trait MinMaxCounter { def sample(): Unit } +class SimpleMinMaxCounter(name: String, tags: Map[String, String], underlyingHistogram: Histogram with DistributionSnapshotInstrument, + val sampleInterval: Duration) extends SnapshotableMinMaxCounter { -class PaddedMinMaxCounter(name: String, tags: Map[String, String], underlyingHistogram: Histogram with DistributionSnapshotInstrument, - val sampleInterval: Duration) extends SnapshotableMinMaxCounter { - - private val min = new LongMaxUpdater(0L) - private val max = new LongMaxUpdater(0L) + private val min = AtomicLongMaxUpdater() + private val max = AtomicLongMaxUpdater() private val sum = new AtomicLong() def dynamicRange: DynamicRange = @@ -88,4 +86,4 @@ class PaddedMinMaxCounter(name: String, tags: Map[String, String], underlyingHis underlyingHistogram.record(currentMin) underlyingHistogram.record(currentMax) } -} \ No newline at end of file +} -- cgit v1.2.3