You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by pk...@apache.org on 2024/03/26 04:51:28 UTC
(logging-log4j2) 16/17: Adapt `log4j-perf-test` to Log4j API 2.x
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch fix/rebase-on-log4j-api-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 8c2ac517b672114e7ecdc27ee72a1cd312c2b9b4
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Mon Mar 25 22:03:19 2024 +0100
Adapt `log4j-perf-test` to Log4j API 2.x
---
.../template/json/JsonTemplateLayoutBenchmarkReport.java | 2 +-
.../log4j/spi/CopyOnWriteOpenHashMapThreadContextMap.java | 6 ++++++
.../log4j/spi/GarbageFreeOpenHashMapThreadContextMap.java | 10 ++++++----
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/log4j-perf-test/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutBenchmarkReport.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutBenchmarkReport.java
index c3db29fdad..3d66e0acc2 100644
--- a/log4j-perf-test/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutBenchmarkReport.java
+++ b/log4j-perf-test/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutBenchmarkReport.java
@@ -36,7 +36,7 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
-import org.apache.logging.log4j.util.JsonReader;
+import org.apache.logging.log4j.kit.json.JsonReader;
/**
* Utility class to summarize {@link JsonTemplateLayoutBenchmark} results in Asciidoctor.
diff --git a/log4j-perf-test/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteOpenHashMapThreadContextMap.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteOpenHashMapThreadContextMap.java
index 4b5827be74..bea254fdbf 100644
--- a/log4j-perf-test/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteOpenHashMapThreadContextMap.java
+++ b/log4j-perf-test/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteOpenHashMapThreadContextMap.java
@@ -16,6 +16,8 @@
*/
package org.apache.logging.log4j.spi;
+import org.apache.logging.log4j.core.impl.CoreKeys;
+import org.apache.logging.log4j.kit.env.PropertyEnvironment;
import org.apache.logging.log4j.perf.nogc.OpenHashStringMap;
import org.apache.logging.log4j.util.ReadOnlyStringMap;
import org.apache.logging.log4j.util.StringMap;
@@ -32,6 +34,10 @@ public class CopyOnWriteOpenHashMapThreadContextMap extends CopyOnWriteSortedArr
/** Constant used in benchmark code */
public static final Class<? extends ThreadContextMap> SUPER = CopyOnWriteSortedArrayThreadContextMap.class;
+ private final int initialCapacity = PropertyEnvironment.getGlobal()
+ .getProperty(CoreKeys.ThreadContext.class)
+ .initialCapacity();
+
@Override
protected StringMap createStringMap() {
return new OpenHashStringMap<>(initialCapacity);
diff --git a/log4j-perf-test/src/main/java/org/apache/logging/log4j/spi/GarbageFreeOpenHashMapThreadContextMap.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/spi/GarbageFreeOpenHashMapThreadContextMap.java
index b324f8d19f..113c6b488f 100644
--- a/log4j-perf-test/src/main/java/org/apache/logging/log4j/spi/GarbageFreeOpenHashMapThreadContextMap.java
+++ b/log4j-perf-test/src/main/java/org/apache/logging/log4j/spi/GarbageFreeOpenHashMapThreadContextMap.java
@@ -37,11 +37,13 @@ public class GarbageFreeOpenHashMapThreadContextMap extends GarbageFreeSortedArr
/** Constant used in benchmark code */
public static final Class<? extends ThreadContextMap> SUPER = GarbageFreeSortedArrayThreadContextMap.class;
+ private final int initialCapacity = PropertyEnvironment.getGlobal()
+ .getProperty(CoreKeys.ThreadContext.class)
+ .initialCapacity();
+
@Override
- protected StringMap createStringMap(final int initialCapacity) {
- return new OpenHashStringMap<>(PropertyEnvironment.getGlobal()
- .getProperty(CoreKeys.ThreadContext.class)
- .initialCapacity());
+ protected StringMap createStringMap() {
+ return new OpenHashStringMap<>(initialCapacity);
}
@Override