From a475884d65b5d48ecda3bec9f33ac0aedcd76ce2 Mon Sep 17 00:00:00 2001 From: Hendrik Ebbers Date: Fri, 10 Nov 2023 18:36:10 +0100 Subject: [PATCH] move atomic classes from metrics to concurrent classes (#9704) Signed-off-by: Hendrik Ebbers --- .../common/metrics/platform/DefaultDoubleAccumulator.java | 2 +- .../swirlds/common/metrics/platform/DefaultDoubleGauge.java | 2 +- .../metrics/platform/DefaultIntegerPairAccumulator.java | 2 +- .../common/{metrics => threading}/atomic/AtomicDouble.java | 4 ++-- .../common/{metrics => threading}/atomic/AtomicIntPair.java | 4 ++-- platform-sdk/swirlds-common/src/main/java/module-info.java | 2 +- .../com/swirlds/common/metrics/atomic/AtomicDoubleTest.java | 1 + .../com/swirlds/common/metrics/atomic/AtomicIntPairTest.java | 1 + .../merkledb/files/MemoryIndexDiskKeyValueStoreTest.java | 2 +- .../com/swirlds/platform/stats/atomic/AtomicSumAndCount.java | 2 +- 10 files changed, 12 insertions(+), 10 deletions(-) rename platform-sdk/swirlds-common/src/main/java/com/swirlds/common/{metrics => threading}/atomic/AtomicDouble.java (98%) rename platform-sdk/swirlds-common/src/main/java/com/swirlds/common/{metrics => threading}/atomic/AtomicIntPair.java (98%) diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/metrics/platform/DefaultDoubleAccumulator.java b/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/metrics/platform/DefaultDoubleAccumulator.java index 8b64bbecdf3b..2c49ea7e5d4e 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/metrics/platform/DefaultDoubleAccumulator.java +++ b/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/metrics/platform/DefaultDoubleAccumulator.java @@ -20,8 +20,8 @@ import com.swirlds.base.utility.ToStringBuilder; import com.swirlds.common.metrics.DoubleAccumulator; -import com.swirlds.common.metrics.atomic.AtomicDouble; import com.swirlds.common.metrics.platform.Snapshot.SnapshotEntry; +import com.swirlds.common.threading.atomic.AtomicDouble; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.List; import java.util.function.DoubleBinaryOperator; diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/metrics/platform/DefaultDoubleGauge.java b/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/metrics/platform/DefaultDoubleGauge.java index 165c21ab4255..879036131b74 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/metrics/platform/DefaultDoubleGauge.java +++ b/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/metrics/platform/DefaultDoubleGauge.java @@ -20,8 +20,8 @@ import com.swirlds.base.utility.ToStringBuilder; import com.swirlds.common.metrics.DoubleGauge; -import com.swirlds.common.metrics.atomic.AtomicDouble; import com.swirlds.common.metrics.platform.Snapshot.SnapshotEntry; +import com.swirlds.common.threading.atomic.AtomicDouble; import java.util.List; /** diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/metrics/platform/DefaultIntegerPairAccumulator.java b/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/metrics/platform/DefaultIntegerPairAccumulator.java index 4357c01b6862..b17df97969a2 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/metrics/platform/DefaultIntegerPairAccumulator.java +++ b/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/metrics/platform/DefaultIntegerPairAccumulator.java @@ -22,8 +22,8 @@ import com.swirlds.common.metrics.IntegerPairAccumulator; import com.swirlds.common.metrics.MetricConfig; import com.swirlds.common.metrics.MetricType; -import com.swirlds.common.metrics.atomic.AtomicIntPair; import com.swirlds.common.metrics.platform.Snapshot.SnapshotEntry; +import com.swirlds.common.threading.atomic.AtomicIntPair; import java.util.List; import java.util.function.BiFunction; import java.util.function.IntSupplier; diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/metrics/atomic/AtomicDouble.java b/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/threading/atomic/AtomicDouble.java similarity index 98% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/metrics/atomic/AtomicDouble.java rename to platform-sdk/swirlds-common/src/main/java/com/swirlds/common/threading/atomic/AtomicDouble.java index 67826795c8f0..6d8046482780 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/metrics/atomic/AtomicDouble.java +++ b/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/threading/atomic/AtomicDouble.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2023 Hedera Hashgraph, LLC + * Copyright (C) 2023 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.metrics.atomic; +package com.swirlds.common.threading.atomic; import static java.lang.Double.doubleToRawLongBits; import static java.lang.Double.longBitsToDouble; diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/metrics/atomic/AtomicIntPair.java b/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/threading/atomic/AtomicIntPair.java similarity index 98% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/metrics/atomic/AtomicIntPair.java rename to platform-sdk/swirlds-common/src/main/java/com/swirlds/common/threading/atomic/AtomicIntPair.java index 9226365131a5..d55fd597cca5 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/metrics/atomic/AtomicIntPair.java +++ b/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/threading/atomic/AtomicIntPair.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2023 Hedera Hashgraph, LLC + * Copyright (C) 2023 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.metrics.atomic; +package com.swirlds.common.threading.atomic; import com.swirlds.common.utility.ByteUtils; import java.util.concurrent.atomic.AtomicLong; diff --git a/platform-sdk/swirlds-common/src/main/java/module-info.java b/platform-sdk/swirlds-common/src/main/java/module-info.java index 8cba711acf76..cf80db810b0d 100644 --- a/platform-sdk/swirlds-common/src/main/java/module-info.java +++ b/platform-sdk/swirlds-common/src/main/java/module-info.java @@ -44,7 +44,6 @@ exports com.swirlds.common.merkle.synchronization.views; exports com.swirlds.common.merkle.utility; exports com.swirlds.common.metrics; - exports com.swirlds.common.metrics.atomic; exports com.swirlds.common.metrics.config; exports com.swirlds.common.metrics.noop; exports com.swirlds.common.metrics.platform; @@ -162,6 +161,7 @@ com.swirlds.platform.test, com.swirlds.platform.gui; exports com.swirlds.common.startup; + exports com.swirlds.common.threading.atomic; requires transitive com.fasterxml.jackson.core; requires transitive com.fasterxml.jackson.databind; diff --git a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/metrics/atomic/AtomicDoubleTest.java b/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/metrics/atomic/AtomicDoubleTest.java index 90f4e189b20e..89afc6bd77fd 100644 --- a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/metrics/atomic/AtomicDoubleTest.java +++ b/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/metrics/atomic/AtomicDoubleTest.java @@ -19,6 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.within; +import com.swirlds.common.threading.atomic.AtomicDouble; import org.junit.jupiter.api.Test; class AtomicDoubleTest { diff --git a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/metrics/atomic/AtomicIntPairTest.java b/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/metrics/atomic/AtomicIntPairTest.java index 5f9700bf1031..57a18ad6630a 100644 --- a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/metrics/atomic/AtomicIntPairTest.java +++ b/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/metrics/atomic/AtomicIntPairTest.java @@ -19,6 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat; import com.swirlds.base.utility.Pair; +import com.swirlds.common.threading.atomic.AtomicIntPair; import org.junit.jupiter.api.Test; class AtomicIntPairTest { diff --git a/platform-sdk/swirlds-jasperdb/src/test/java/com/swirlds/merkledb/files/MemoryIndexDiskKeyValueStoreTest.java b/platform-sdk/swirlds-jasperdb/src/test/java/com/swirlds/merkledb/files/MemoryIndexDiskKeyValueStoreTest.java index 5f188a744c90..427bda62460e 100644 --- a/platform-sdk/swirlds-jasperdb/src/test/java/com/swirlds/merkledb/files/MemoryIndexDiskKeyValueStoreTest.java +++ b/platform-sdk/swirlds-jasperdb/src/test/java/com/swirlds/merkledb/files/MemoryIndexDiskKeyValueStoreTest.java @@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import com.swirlds.common.metrics.atomic.AtomicDouble; +import com.swirlds.common.threading.atomic.AtomicDouble; import com.swirlds.common.units.UnitConstants; import com.swirlds.merkledb.collections.LongListOffHeap; import com.swirlds.test.framework.TestQualifierTags; diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/stats/atomic/AtomicSumAndCount.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/stats/atomic/AtomicSumAndCount.java index 00bafca1f798..6f5649a3f18b 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/stats/atomic/AtomicSumAndCount.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/stats/atomic/AtomicSumAndCount.java @@ -16,7 +16,7 @@ package com.swirlds.platform.stats.atomic; -import com.swirlds.common.metrics.atomic.AtomicIntPair; +import com.swirlds.common.threading.atomic.AtomicIntPair; /** * Atomically sums the values provided as well as counting the number of additions