From a29d0526f586aa63b0fd998f0ba99fe7b5a8ea0e Mon Sep 17 00:00:00 2001 From: Jaroslav Bachorik Date: Wed, 18 Oct 2023 11:49:25 +0000 Subject: [PATCH] Add stateless setter API --- .../share/classes/jdk/jfr/ContextType.java | 12 ++- .../jfr/internal/context/BaseContextType.java | 5 ++ .../internal/context/ContextDescriptor.java | 2 +- .../internal/context/ContextRepository.java | 21 +++-- .../jfr/internal/context/ContextWriter.java | 87 +++++++++++++++---- 5 files changed, 98 insertions(+), 29 deletions(-) diff --git a/src/jdk.jfr/share/classes/jdk/jfr/ContextType.java b/src/jdk.jfr/share/classes/jdk/jfr/ContextType.java index 55f77d802fc77..f644c3f3fa7cd 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/ContextType.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/ContextType.java @@ -15,10 +15,16 @@ import jdk.jfr.internal.context.ContextRepository; public abstract class ContextType extends BaseContextType { - public static interface Registration { + public interface Registration { Stream> types(); } + public interface Setter { + void setAttribute(String name, String value); + void clearAttribute(String name); + void clearAll(); + } + public static final class Captured> implements Closeable, AutoCloseable { private final T parent, current; @@ -55,4 +61,8 @@ public final Captured capture() { } protected ContextType() {} + + public static Setter setterFor(Class type) { + return BaseContextType.setterFor(type); + } } diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/context/BaseContextType.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/context/BaseContextType.java index 00f01afa62761..abf89e3578553 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/internal/context/BaseContextType.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/context/BaseContextType.java @@ -1,5 +1,6 @@ package jdk.jfr.internal.context; +import jdk.jfr.ContextType; import jdk.jfr.FlightRecorder; import jdk.jfr.internal.JVM; import jdk.jfr.internal.PlatformRecorder; @@ -24,4 +25,8 @@ public final boolean isActive() { private static boolean shouldCaptureState() { return FlightRecorder.isInitialized() && PlatformRecorder.hasRecordings() && JVM.isContextEnabled(); } + + public static ContextType.Setter setterFor(Class type) { + return ContextRepository.getOrRegister(type); + } } diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/context/ContextDescriptor.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/context/ContextDescriptor.java index b393282d85b4c..4e8889321b364 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/internal/context/ContextDescriptor.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/context/ContextDescriptor.java @@ -2,5 +2,5 @@ import java.lang.invoke.VarHandle; -public record ContextDescriptor(String holderId, String name, String label, String description, VarHandle access) { +public record ContextDescriptor(int order, String holderId, String name, String label, String description, VarHandle access) { } diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/context/ContextRepository.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/context/ContextRepository.java index 1f19e86c0b443..9ba6069b9a72e 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/internal/context/ContextRepository.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/context/ContextRepository.java @@ -6,7 +6,9 @@ import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Arrays; +import java.util.HashSet; import java.util.List; +import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; import jdk.jfr.ContextType; @@ -48,12 +50,13 @@ public static ContextWriter getOrRegister(Class c return contextWriters.get(contextTypeClass); } - private static List descriptorsOf(Class contextTypeClass) { + private static Set descriptorsOf(Class contextTypeClass) { try { - List ctxDescriptors = new ArrayList<>(8); + Set ctxDescriptors = new HashSet<>(8); Name typeNameAnnot = contextTypeClass.getAnnotation(Name.class); String id = typeNameAnnot.value(); MethodHandles.Lookup lookup = MethodHandles.publicLookup(); + int order = 0; for (Field f : contextTypeClass.getFields()) { Name nameAnnot = f.getAnnotation(Name.class); Label labelAnnot = f.getAnnotation(Label.class); @@ -62,7 +65,7 @@ private static List descriptorsOf String name = nameAnnot != null ? nameAnnot.value() : f.getName(); String label = labelAnnot != null ? labelAnnot.value() : name; String desc = descAnnot != null ? descAnnot.value() : ""; - ctxDescriptors.add(new ContextDescriptor(id, name, label, desc, lookup.unreflectVarHandle(f))); + ctxDescriptors.add(new ContextDescriptor(order++, id, name, label, desc, lookup.unreflectVarHandle(f))); } } return ctxDescriptors; @@ -72,7 +75,7 @@ private static List descriptorsOf } private static ContextWriter writerFor(Class type) { - List ctxDescriptors = descriptorsOf(type); + Set ctxDescriptors = descriptorsOf(type); int offset = register(ctxDescriptors); if (offset == -2) { Logger.log(JFR, INFO, @@ -85,7 +88,7 @@ private static ContextWriter writerFor(Class type return offset > -1 ? new ContextWriter(offset, ctxDescriptors) : ContextWriter.NULL; } - private static int register(List descriptors) { + private static int register(Set descriptors) { if (!shouldCaptureState()) { return -1; } @@ -96,12 +99,12 @@ private static int register(List descriptors) { return -3; } final int offset = slotPointer; - int idx = 0; + int top = 0; for (var descriptor : descriptors) { - allDescriptors[idx + slotPointer] = descriptor; - idx++; + allDescriptors[descriptor.order() + slotPointer] = descriptor; + top = Math.max(top, descriptor.order()); } - slotPointer += idx; + slotPointer += top + 1; JVM.setUsedContextSize(slotPointer); return offset; } diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/context/ContextWriter.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/context/ContextWriter.java index 40d38278d14fd..19305e4e57223 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/internal/context/ContextWriter.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/context/ContextWriter.java @@ -1,26 +1,25 @@ package jdk.jfr.internal.context; -import java.lang.invoke.MethodHandles.Lookup; import java.nio.LongBuffer; -import java.lang.invoke.MethodType; -import java.lang.invoke.VarHandle; -import java.util.ArrayList; import java.util.Collections; -import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; import jdk.jfr.ContextType; -import jdk.jfr.FlightRecorder; import jdk.jfr.internal.JVM; import jdk.jfr.internal.StringPool; -public final class ContextWriter { +public final class ContextWriter implements ContextType.Setter { static final ContextWriter NULL = new ContextWriter(-1, null); private final int offset; - private final List descriptors; + private final Set descriptors; + private final Map attributeIndexMap; - ContextWriter(int offset, List descriptors) { + ContextWriter(int offset, Set descriptors) { this.offset = offset; - this.descriptors = offset > -1 ? Collections.unmodifiableList(descriptors) : null; + this.descriptors = offset > -1 ? Collections.unmodifiableSet(descriptors) : null; + this.attributeIndexMap = this.descriptors != null ? this.descriptors.stream().collect(Collectors.toUnmodifiableMap(ContextDescriptor::name, cd -> cd)) : null; } public boolean isActive() { @@ -35,12 +34,10 @@ void write(BaseContextType target) { if (context == null) { return; } - int cntr = offset; for (ContextDescriptor cd : descriptors) { - String value = (String) cd.access().get(target); - context.put(cntr++, value != null ? StringPool.addString(value, false) : 0); - if (cntr >= 8) { - break; + if (cd.order() < 8) { + String value = (String) cd.access().get(target); + context.put(offset + cd.order(), value != null ? StringPool.addString(value, false) : 0); } } } @@ -53,10 +50,64 @@ void clear(BaseContextType target) { if (context == null) { return; } - int cntr = 0; for (ContextDescriptor cd : descriptors) { - context.put(offset + (cntr++), 0L); - cd.access().set(target, null); + if (cd.order() < 8) { + context.put(offset + cd.order(), 0L); + cd.access().set(target, null); + } + } + } + + @Override + public void clearAll() { + if (offset == -1 || descriptors == null) { + return; + } + LongBuffer context = JVM.getThreadContextBuffer(); + if (context == null) { + return; + } + for (ContextDescriptor cd : descriptors) { + context.put(offset + cd.order(), 0L); + } + } + + @Override + public void setAttribute(String name, String value) { + LongBuffer context = JVM.getThreadContextBuffer(); + if (context == null) { + return; + } + int pos = getContextIndex(name, String.class); + if (pos < 0) { + System.err.println("===> set err: " + name + ": " + pos); + return; + } + context.put(pos, StringPool.addString(value, false)); + } + + @Override + public void clearAttribute(String name) { + LongBuffer context = JVM.getThreadContextBuffer(); + if (context == null) { + return; + } + int pos = getContextIndex(name, String.class); + if (pos < 0) { + System.err.println("===> clear err: " + name + ": " + pos); + return; + } + context.put(pos, 0); + } + + private int getContextIndex(String name, Class type) { + ContextDescriptor cd = attributeIndexMap.get(name); + if (cd == null) { + return -1; + } + if (cd.access().varType() != type) { + return -2; } + return offset + cd.order(); } }